David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
boot	x86/build: Don't verify mtools configuration file for isoimage	2017-12-11 18:55:38 +01:00
configs	x86/unwind: Rename unwinder config options to 'CONFIG_UNWINDER_*'	2017-10-14 10:12:12 +02:00
crypto	crypto: salsa20 - fix blkcipher_walk API usage	2017-11-29 16:25:58 +11:00
entry	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-23 11:53:04 -08:00
events	locking/barriers: Convert users of lockless_dereference() to READ_ONCE()	2017-12-17 13:57:15 +01:00
hyperv	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
ia32	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
kvm	ARM fixes:	2017-12-21 10:44:13 -08:00
lib	Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-18 08:59:15 -08:00
math-emu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mm	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-23 11:53:04 -08:00
net	bpf: x64: add JIT support for multi-function programs	2017-12-17 20:34:36 +01:00
oprofile	Modules updates for v4.15	2017-11-15 13:46:33 -08:00
pci	pci-v4.15-fixes-1	2017-12-14 17:02:39 -08:00
platform	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-23 11:53:04 -08:00
power	Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-18 08:59:15 -08:00
purgatory	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ras	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
realmode	x86/realmode: Don't decrypt trampoline area under SEV	2017-11-07 15:35:55 +01:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
um	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
video
xen	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-23 11:53:04 -08:00
.gitignore
Kbuild	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-09-07 09:25:15 -07:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
Kconfig.cpu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig.debug	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
Makefile	kmemcheck: remove annotations	2017-11-15 18:21:04 -08:00
Makefile_32.cpu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.um	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00