David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
boot	powerpc/boot: Fix build failures with -j 1	2018-12-06 16:10:15 +11:00
configs	powerpc/config: Enable CONFIG_PRINTK_TIME	2018-10-03 15:40:06 +10:00
crypto	powerpc updates for 4.19	2018-08-17 11:32:50 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
kernel	powerpc fixes for 4.20 #4	2018-12-14 09:33:34 -08:00
kvm	PPC KVM fixes for 4.20	2018-11-25 18:56:32 +01:00
lib	memblock: stop using implicit alignment to SMP_CACHE_BYTES	2018-10-31 08:54:16 -07: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	powerpc/mm: Fallback to RAM if the altmap is unusable	2018-12-09 21:33:21 +11:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-12-10 18:00:43 -08:00
oprofile	powerpc updates for 4.20	2018-10-26 14:36:21 -07:00
perf	powerpc/8xx: Use patch_site for perf counters setup	2018-10-26 21:58:58 +11:00
platforms	powerpc/papr_scm: Use ibm,unit-guid as the iset cookie	2018-12-09 21:32:51 +11:00
purgatory	powerpc updates for 4.19	2018-08-17 11:32:50 -07:00
sysdev	memblock: stop using implicit alignment to SMP_CACHE_BYTES	2018-10-31 08:54:16 -07:00
tools	powerpc: Add a checkpatch wrapper with our preferred settings	2018-08-07 21:49:25 +10:00
xmon	powerpc/xmon: Relax frame size for clang	2018-10-31 20:39:25 +11:00
Kbuild	powerpc: Add -Werror at arch/powerpc level	2018-10-19 00:56:17 +11:00
Kconfig	Kbuild updates for v4.20 (2nd)	2018-11-03 10:47:33 -07:00
Kconfig.debug	powerpc: remove redundant 'default n' from Kconfig-s	2018-10-13 22:21:25 +11:00
Makefile	kbuild: replace cc-name test with CONFIG_CC_IS_CLANG	2018-11-02 22:49:00 +09:00
Makefile.postlink	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00