David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
boot	Kbuild updates for v4.21	2018-12-29 12:03:17 -08:00
configs	powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig	2018-12-30 14:00:47 +11: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	2019-02-20 00:34:07 -08:00
kernel	powerpc/syscalls: Fix syscall tracing	2019-01-15 21:32:25 +11:00
kvm	Merge branch 'master' into fixes	2019-01-04 22:07:47 +11:00
lib	Remove 'type' argument from access_ok() function	2019-01-03 18:57:57 -08: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/radix: Fix kernel crash with mremap()	2019-01-31 20:10:15 +11:00
net	bpf: powerpc64: add JIT support for bpf line info	2019-02-01 21:03:34 +01:00
oprofile	Remove 'type' argument from access_ok() function	2019-01-03 18:57:57 -08:00
perf	powerpc/perf: Update perf_regs structure to include MMCRA	2019-01-08 19:22:47 +11:00
platforms	powerpc fixes for 5.0 #6	2019-02-23 11:13:50 -08:00
purgatory	powerpc updates for 4.19	2018-08-17 11:32:50 -07:00
sysdev	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
tools	powerpc/tools/checkpatch: Ignore DT_SPLIT_BINDING_PATCH	2018-12-04 19:45:01 +11:00
xmon	powerpc/xmon: fix dump_segments()	2018-12-19 18:56:32 +11:00
Kbuild	powerpc: Add -Werror at arch/powerpc level	2018-10-19 00:56:17 +11:00
Kconfig	Kconfig file consolidation for v4.21	2018-12-29 13:40:29 -08:00
Kconfig.debug	powerpc: remove redundant 'default n' from Kconfig-s	2018-10-13 22:21:25 +11:00
Makefile	powerpc updates for 4.21	2018-12-27 10:43:24 -08: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