David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
boot	powerpc updates for 4.17	2018-04-07 12:08:19 -07:00
configs	scsi: remove the fdomain and fdomain_cs drivers	2018-03-19 22:54:47 -04:00
crypto
include	powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit	2018-05-21 20:45:31 -07:00
kernel	powerpc fixes for 4.17 #7	2018-05-25 09:32:00 -07:00
kvm	powerpc/kvm/booke: Fix altivec related build break	2018-04-27 16:36:03 +10:00
lib	powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit	2018-05-21 20:45:31 -07:00
math-emu
mm	powerpc/mm: Flush cache on memory hot(un)plug	2018-04-24 09:46:56 +10:00
net	bpf: powerpc64: add JIT support for multi-function programs	2018-05-24 09:20:49 +02:00
oprofile	powerpc: Use sizeof(*foo) rather than sizeof(struct foo)	2018-03-20 16:47:53 +11:00
perf	powerpc updates for 4.17	2018-04-07 12:08:19 -07:00
platforms	powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit	2018-05-21 20:45:31 -07:00
purgatory
sysdev	powerpc/xive: Fix trying to "push" an already active pool VP	2018-04-19 00:49:45 +10:00
tools
xmon	Merge branch 'topic/paca' into next	2018-03-31 09:09:36 +11:00
Kconfig	kexec_file: make use of purgatory optional	2018-04-13 17:10:27 -07:00
Kconfig.debug
Makefile	powerpc/64s: Add POWER9 CPU type selection	2018-04-01 22:15:32 +10:00
Makefile.postlink