gitweb.dragonflybsd.org Git - linux.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:32:44 +0000 (10:32 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:32:44 +0000 (10:32 +0100)
commit	8c5db92a705d9e2c986adec475980d1120fa07b4
tree	9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d	tree \| snapshot
parent	ca5d376e17072c1b60c3fee66f3be58ef018952d	commit \| diff
parent	e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf	commit \| diff

Merge branch 'linus' into locking/core, to resolve conflicts

Conflicts:
include/linux/compiler-clang.h
include/linux/compiler-gcc.h
include/linux/compiler-intel.h
include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

96 files changed:

arch/alpha/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
arch/alpha/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/alpha/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/arc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/m32r/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock_lnkget.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock_lock1.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/pm-cps.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/s390/lib/spinlock.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/atomic_32.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/spinlock_32.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/spinlock_64.h	diff1 \|	diff2 \|	blob \| history
arch/um/include/shared/init.h	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/mmu_context.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/qspinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/vgtod.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/spinlock.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/uhci-hcd.h	diff1 \|	diff2 \|	blob \| history
fs/crypto/keyinfo.c	diff1 \|	diff2 \|	blob \| history
fs/fcntl.c	diff1 \|	diff2 \|	blob \| history
fs/fs_pin.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ncpfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/readdir.c	diff1 \|	diff2 \|	blob \| history
fs/proc/array.c	diff1 \|	diff2 \|	blob \| history
fs/proc_namespace.c	diff1 \|	diff2 \|	blob \| history
fs/readdir.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/atomic-long.h	diff1 \|	diff2 \|	blob \| history
include/asm-generic/qrwlock_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-generic/rwsem.h	diff1 \|	diff2 \|	blob \| history
include/linux/atomic.h	diff1 \|	diff2 \|	blob \| history
include/linux/average.h	diff1 \|	diff2 \|	blob \| history
include/linux/bitops.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-clang.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-gcc.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-intel.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/completion.h	diff1 \|	diff2 \|	blob \| history
include/linux/dcache.h	diff1 \|	diff2 \|	blob \| history
include/linux/dynamic_queue_limits.h	diff1 \|	diff2 \|	blob \| history
include/linux/genetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/genhd.h	diff1 \|	diff2 \|	blob \| history
include/linux/huge_mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/jump_label.h	diff1 \|	diff2 \|	blob \| history
include/linux/jump_label_ratelimit.h	diff1 \|	diff2 \|	blob \| history
include/linux/linkage.h	diff1 \|	diff2 \|	blob \| history
include/linux/lockdep.h	diff1 \|	diff2 \|	blob \| history
include/linux/netfilter/nfnetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/rculist.h	diff1 \|	diff2 \|	blob \| history
include/linux/rtnetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/rwsem.h	diff1 \|	diff2 \|	blob \| history
include/linux/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/linux/workqueue.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/stddef.h	diff1 \|	diff2 \|	blob \| history
kernel/acct.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/locking/rwsem.c	diff1 \|	diff2 \|	blob \| history
kernel/locking/spinlock.c	diff1 \|	diff2 \|	blob \| history
kernel/seccomp.c	diff1 \|	diff2 \|	blob \| history
kernel/task_work.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_stack.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
lib/assoc_array.c	diff1 \|	diff2 \|	blob \| history
lib/dynamic_queue_limits.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/slab.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
scripts/headers_install.sh	diff1 \|	diff2 \|	blob \| history
sound/firewire/amdtp-stream.h	diff1 \|	diff2 \|	blob \| history
tools/arch/x86/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
tools/include/asm-generic/atomic-gcc.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h	diff1 \|	diff2 \|	blob \| history

Linux Project Source (from git://github.com/torvalds/linux)

RSS Atom

arch/alpha/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
arch/alpha/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/alpha/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/arc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/m32r/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock_lnkget.h	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/spinlock_lock1.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/pm-cps.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/s390/lib/spinlock.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/atomic_32.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/spinlock_32.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/spinlock_64.h	diff1 \|	diff2 \|	blob \| history
arch/um/include/shared/init.h	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/mmu_context.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/qspinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/rwsem.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/vgtod.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/spinlock.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/uhci-hcd.h	diff1 \|	diff2 \|	blob \| history
fs/crypto/keyinfo.c	diff1 \|	diff2 \|	blob \| history
fs/fcntl.c	diff1 \|	diff2 \|	blob \| history
fs/fs_pin.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ncpfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/readdir.c	diff1 \|	diff2 \|	blob \| history
fs/proc/array.c	diff1 \|	diff2 \|	blob \| history
fs/proc_namespace.c	diff1 \|	diff2 \|	blob \| history
fs/readdir.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/atomic-long.h	diff1 \|	diff2 \|	blob \| history
include/asm-generic/qrwlock_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-generic/rwsem.h	diff1 \|	diff2 \|	blob \| history
include/linux/atomic.h	diff1 \|	diff2 \|	blob \| history
include/linux/average.h	diff1 \|	diff2 \|	blob \| history
include/linux/bitops.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-clang.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-gcc.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-intel.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/completion.h	diff1 \|	diff2 \|	blob \| history
include/linux/dcache.h	diff1 \|	diff2 \|	blob \| history
include/linux/dynamic_queue_limits.h	diff1 \|	diff2 \|	blob \| history
include/linux/genetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/genhd.h	diff1 \|	diff2 \|	blob \| history
include/linux/huge_mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/jump_label.h	diff1 \|	diff2 \|	blob \| history
include/linux/jump_label_ratelimit.h	diff1 \|	diff2 \|	blob \| history
include/linux/linkage.h	diff1 \|	diff2 \|	blob \| history
include/linux/lockdep.h	diff1 \|	diff2 \|	blob \| history
include/linux/netfilter/nfnetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/rculist.h	diff1 \|	diff2 \|	blob \| history
include/linux/rtnetlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/rwsem.h	diff1 \|	diff2 \|	blob \| history
include/linux/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/linux/workqueue.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/stddef.h	diff1 \|	diff2 \|	blob \| history
kernel/acct.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/locking/rwsem.c	diff1 \|	diff2 \|	blob \| history
kernel/locking/spinlock.c	diff1 \|	diff2 \|	blob \| history
kernel/seccomp.c	diff1 \|	diff2 \|	blob \| history
kernel/task_work.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_stack.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
lib/assoc_array.c	diff1 \|	diff2 \|	blob \| history
lib/dynamic_queue_limits.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/slab.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
scripts/headers_install.sh	diff1 \|	diff2 \|	blob \| history
sound/firewire/amdtp-stream.h	diff1 \|	diff2 \|	blob \| history
tools/arch/x86/include/asm/atomic.h	diff1 \|	diff2 \|	blob \| history
tools/include/asm-generic/atomic-gcc.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h	diff1 \|	diff2 \|	blob \| history