Merge branch 'linus' into sched/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-08 10:17:15 +01:00 · 2017-11-08 10:17:15 +01:00 · 8a103df440
commit 8a103df440
parent a9903f04e0 fbc3edf7d7
13316 changed files with 20955 additions and 4714 deletions
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Trace files that want to automate creation of all tracepoints defined
 * in their file should include this file. The following are macros that the
--- a/include/trace/events/9p.h
+++ b/include/trace/events/9p.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM 9p

--- a/include/trace/events/alarmtimer.h
+++ b/include/trace/events/alarmtimer.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM alarmtimer

--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM asoc

--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bcache

--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM block

--- a/include/trace/events/bpf.h
+++ b/include/trace/events/bpf.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bpf

--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM btrfs

--- a/include/trace/events/cgroup.h
+++ b/include/trace/events/cgroup.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cgroup

--- a/include/trace/events/cma.h
+++ b/include/trace/events/cma.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cma

--- a/include/trace/events/compaction.h
+++ b/include/trace/events/compaction.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM compaction

--- a/include/trace/events/context_tracking.h
+++ b/include/trace/events/context_tracking.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM context_tracking

--- a/include/trace/events/cpuhp.h
+++ b/include/trace/events/cpuhp.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cpuhp

--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if IS_ENABLED(CONFIG_NET_DEVLINK)

 #undef TRACE_SYSTEM
--- a/include/trace/events/dma_fence.h
+++ b/include/trace/events/dma_fence.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM dma_fence

--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ext4

--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM f2fs

--- a/include/trace/events/fib.h
+++ b/include/trace/events/fib.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fib

--- a/include/trace/events/fib6.h
+++ b/include/trace/events/fib6.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fib6

--- a/include/trace/events/filelock.h
+++ b/include/trace/events/filelock.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Events for filesystem locks
 *
--- a/include/trace/events/filemap.h
+++ b/include/trace/events/filemap.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM filemap

--- a/include/trace/events/fs_dax.h
+++ b/include/trace/events/fs_dax.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fs_dax

--- a/include/trace/events/fsi.h
+++ b/include/trace/events/fsi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fsi
--- a/include/trace/events/fsi_master_gpio.h
+++ b/include/trace/events/fsi_master_gpio.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fsi_master_gpio
--- a/include/trace/events/gpio.h
+++ b/include/trace/events/gpio.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM gpio

--- a/include/trace/events/hswadsp.h
+++ b/include/trace/events/hswadsp.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM hswadsp

--- a/include/trace/events/huge_memory.h
+++ b/include/trace/events/huge_memory.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM huge_memory

--- a/include/trace/events/intel-sst.h
+++ b/include/trace/events/intel-sst.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM intel-sst

--- a/include/trace/events/intel_ish.h
+++ b/include/trace/events/intel_ish.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM intel_ish

--- a/include/trace/events/iommu.h
+++ b/include/trace/events/iommu.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * iommu trace points
 *
--- a/include/trace/events/ipi.h
+++ b/include/trace/events/ipi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ipi

--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq

--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd2

--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kmem

--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_MAIN_H

--- a/include/trace/events/libata.h
+++ b/include/trace/events/libata.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM libata

--- a/include/trace/events/lock.h
+++ b/include/trace/events/lock.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lock

--- a/include/trace/events/mce.h
+++ b/include/trace/events/mce.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mce

--- a/include/trace/events/mdio.h
+++ b/include/trace/events/mdio.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mdio

--- a/include/trace/events/migrate.h
+++ b/include/trace/events/migrate.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM migrate

--- a/include/trace/events/mmc.h
+++ b/include/trace/events/mmc.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mmc

--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/node.h>
 #include <linux/mmzone.h>
 #include <linux/compaction.h>
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Because linux/module.h has tracepoints in the header, and ftrace.h
 * used to include this file, define_trace.h includes linux/module.h
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM napi

--- a/include/trace/events/net.h
+++ b/include/trace/events/net.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM net

--- a/include/trace/events/nilfs2.h
+++ b/include/trace/events/nilfs2.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM nilfs2

--- a/include/trace/events/nmi.h
+++ b/include/trace/events/nmi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM nmi

--- a/include/trace/events/oom.h
+++ b/include/trace/events/oom.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM oom

--- a/include/trace/events/page_isolation.h
+++ b/include/trace/events/page_isolation.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM page_isolation

--- a/include/trace/events/page_ref.h
+++ b/include/trace/events/page_ref.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM page_ref

--- a/include/trace/events/pagemap.h
+++ b/include/trace/events/pagemap.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM pagemap

--- a/include/trace/events/percpu.h
+++ b/include/trace/events/percpu.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM percpu

--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM power

--- a/include/trace/events/power_cpu_migrate.h
+++ b/include/trace/events/power_cpu_migrate.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM power

--- a/include/trace/events/printk.h
+++ b/include/trace/events/printk.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM printk

--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random

--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rcu

--- a/include/trace/events/regulator.h
+++ b/include/trace/events/regulator.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regulator

--- a/include/trace/events/rpm.h
+++ b/include/trace/events/rpm.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rpm
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sched

--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM scsi

--- a/include/trace/events/signal.h
+++ b/include/trace/events/signal.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM signal

--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb

--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sock

--- a/include/trace/events/spi.h
+++ b/include/trace/events/spi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM spi

--- a/include/trace/events/spmi.h
+++ b/include/trace/events/spmi.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM spmi

--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sunrpc

--- a/include/trace/events/sunvnet.h
+++ b/include/trace/events/sunvnet.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sunvnet

--- a/include/trace/events/swiotlb.h
+++ b/include/trace/events/swiotlb.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM swiotlb

--- a/include/trace/events/syscalls.h
+++ b/include/trace/events/syscalls.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM raw_syscalls
 #undef TRACE_INCLUDE_FILE
--- a/include/trace/events/target.h
+++ b/include/trace/events/target.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM target

--- a/include/trace/events/task.h
+++ b/include/trace/events/task.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM task

--- a/include/trace/events/thermal.h
+++ b/include/trace/events/thermal.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thermal

--- a/include/trace/events/thermal_power_allocator.h
+++ b/include/trace/events/thermal_power_allocator.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thermal_power_allocator

--- a/include/trace/events/thp.h
+++ b/include/trace/events/thp.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thp

--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM timer

--- a/include/trace/events/tlb.h
+++ b/include/trace/events/tlb.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM tlb

--- a/include/trace/events/udp.h
+++ b/include/trace/events/udp.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM udp

--- a/include/trace/events/v4l2.h
+++ b/include/trace/events/v4l2.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM v4l2

--- a/include/trace/events/vb2.h
+++ b/include/trace/events/vb2.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vb2

--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vmscan

--- a/include/trace/events/vsock_virtio_transport_common.h
+++ b/include/trace/events/vsock_virtio_transport_common.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vsock

--- a/include/trace/events/wbt.h
+++ b/include/trace/events/wbt.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM wbt

--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM workqueue

--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM writeback

--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM xdp

--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM xen

--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 #undef TRACE_SYSTEM_VAR

--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TRACE_SYSCALL_H
 #define _TRACE_SYSCALL_H

--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Stage 1 of the trace events.
 *