David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07: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/64s/radix: Fix missing global invalidations when removing copro	2018-08-01 23:23:41 +10:00
kernel	pci-v4.18-fixes-5	2018-08-02 10:59:19 -07:00
kvm	KVM: PPC: Check if IOMMU page is contained in the pinned physical page	2018-07-18 16:17:17 +10:00
lib	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
math-emu
mm	KVM: PPC: Check if IOMMU page is contained in the pinned physical page	2018-07-18 16:17:17 +10:00
net	bpf, ppc64: fix unexpected r0=0 exit path inside bpf_xadd	2018-07-19 16:08:06 -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	pci-v4.18-fixes-5	2018-08-02 10:59:19 -07: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/xmon: Fix disassembly since printf changes	2018-07-17 21:18:14 +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/Makefile: Assemble with -me500 when building for E500	2018-07-18 20:34:42 +10:00
Makefile.postlink