David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
boot	powerpc/mpc85xx: move ptp timer out of fman in dts	2018-06-26 22:15:14 +09:00
configs	powerpc/embedded6xx: Remove C2K board support	2018-06-04 00:39:22 +10:00
crypto	crypto: hash - annotate algorithms taking optional key	2018-01-12 23:03:35 +11:00
include	powerpc/mm/32: Fix pgtable_page_dtor call	2018-06-26 23:43:14 +10:00
kernel	Kbuild fixes for v4.18	2018-06-30 13:05:30 -07:00
kvm	Merge tag 'kvm-ppc-next-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD	2018-06-14 17:42:54 +02:00
lib	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
math-emu
mm	Kbuild fixes for v4.18	2018-06-30 13:05:30 -07:00
net	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
oprofile	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
perf	powerpc/perf: Unregister thread-imc if core-imc not supported	2018-06-03 20:43:37 +10:00
platforms	powerpc/powermac: Fix rtc read/write functions	2018-06-27 13:48:49 +10:00
purgatory
sysdev	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
tools	powerpc/kbuild: move -mprofile-kernel check to Kconfig	2018-06-11 09:16:29 +09:00
xmon	powerpc/64: Save stack pointer when we hard disable interrupts	2018-06-03 20:43:42 +10:00
Kconfig	Kbuild updates for v4.18 (2nd)	2018-06-13 08:40:34 -07:00
Kconfig.debug	powerpc: Add new kconfig CONFIG_PPC_IRQ_SOFT_MASK_DEBUG	2018-01-19 22:37:03 +11:00
Makefile	powerpc/e500mc: Set assembler machine type to e500mc	2018-06-19 21:28:20 +10:00
Makefile.postlink