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
..
boot	powerpc/boot: Fix zImage TOC alignment	2017-03-08 10:39:32 +11:00
configs	powerpc updates for 4.11 part 2	2017-03-01 10:10:16 -08:00
crypto	powerpc/crypto/crc32c-vpmsum: Fix missing preempt_disable()	2017-04-07 21:12:58 +10:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
kernel	powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y	2017-04-18 20:19:52 +10:00
kvm	KVM: PPC: Book3S HV: Check for kmalloc errors in ioctl	2017-04-06 15:50:43 +10:00
lib	powerpc fixes for 4.11 #3	2017-03-07 10:46:10 -08:00
math-emu	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
mm	powerpc/mm: Add missing global TLB invalidate if cxl is active	2017-04-05 22:13:37 +10:00
net	powerpc updates for 4.11 part 1.	2017-02-22 10:30:38 -08:00
oprofile	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
perf	powerpc/perf: Handle sdar_mode for marked event in power9	2017-03-09 13:34:54 +11:00
platforms	powerpc/pseries: Don't give a warning when HPT resizing isn't available	2017-03-17 16:10:58 +11:00
purgatory	kexec, x86/purgatory: Unbreak it and clean it up	2017-03-10 20:55:09 +01:00
scripts	powerpc/ftrace: Add Kconfig & Make glue for mprofile-kernel	2016-03-07 14:53:56 +11:00
sysdev	axonram: Fix gendisk handling	2017-03-08 10:55:40 -07:00
xmon	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>	2017-03-02 08:42:29 +01:00
Kconfig	powerpc: Sort the selects under CONFIG_PPC	2017-03-06 23:05:42 +11:00
Kconfig.debug	powerpc/xmon: Enable disassembly files (compilation changes)	2017-02-15 20:02:42 +11:00
Makefile	powerpc: Fix compiling a BE kernel with a powerpc64le toolchain	2017-03-03 11:24:50 +11:00
relocs_check.sh	powerpc/64: whitelist unresolved modversions CRCs	2016-09-22 14:46:31 +02:00