summaryrefslogtreecommitdiffstats
path: root/kernel/sched/rt.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-07 18:11:56 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-07 18:11:56 -0800
commit0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch)
treef0aa64e956d1d2addb2263ddcd238e9f014b36a0 /kernel/sched/rt.c
parent4e974c120039e35b90d2cb0459452bd9a6a71594 (diff)
parent39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff)
downloadtalos-op-linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.gz
talos-op-linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge problems when some header files get deleted.
Diffstat (limited to 'kernel/sched/rt.c')
-rw-r--r--kernel/sched/rt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 0af5ca9e3e3f..3c96c80e0992 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Real-Time Scheduling Class (mapped to the SCHED_FIFO and SCHED_RR
* policies)
OpenPOWER on IntegriCloud