David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
appldata	sched/headers: Move task statistics APIs from <linux/sched.h> to <linux/sched/stat.h>	2017-03-03 01:43:43 +01:00
boot	s390/decompressor: fix initrd corruption caused by bss clear	2017-03-22 08:21:20 +01:00
configs	perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS	2017-03-01 10:26:39 +01:00
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-03-12 14:22:25 -07:00
hypfs	s390: hypfs: make inode explicitly non-modular	2016-10-31 17:55:40 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-04-03 08:44:43 -07:00
kvm	KVM: s390: remove change-recording override support	2017-04-03 12:45:08 +02:00
lib	s390: replace ACCESS_ONCE with READ_ONCE	2017-02-17 07:40:46 +01:00
mm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-03-12 14:22:25 -07:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-02-22 10:20:04 -08:00
numa	s390/numa: pin all possible cpus to nodes early	2016-12-07 07:23:33 +01:00
oprofile	s390/dumpstack: restore reliable indicator for call traces	2016-10-17 14:44:30 +02:00
pci	This is a tree wide change and has been kept separate for that reason.	2017-02-25 13:45:43 -08:00
tools	KVM: s390: instruction-execution-protection support	2017-01-30 11:17:28 +01:00
defconfig	perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS	2017-03-01 10:26:39 +01:00
Kbuild	s390/numa: add core infrastructure	2015-08-03 18:40:25 +02:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-02-27 23:03:04 -08:00
Kconfig.debug	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-02-22 10:20:04 -08:00
Makefile	s390: add assembler include path for vx-insn.h	2016-09-06 11:00:04 +02:00