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	mvebu fixes for 5.0 (part 2)	2019-02-22 14:58:41 +01:00
configs	arm64: defconfig: enable modules for amlogic s400 sound card	2019-01-08 15:27:50 -08:00
crypto	Kbuild updates for v4.21	2018-12-29 12:03:17 -08:00
include	arm64/neon: Disable -Wincompatible-pointer-types when building with Clang	2019-02-18 10:54:47 +00:00
kernel	arm64 fixes for 5.0	2019-02-21 09:11:36 -08:00
kvm	KVM: arm64: Forbid kprobing of the VHE world-switch code	2019-02-07 11:44:47 +00:00
lib	arm64: string: use asm EXPORT_SYMBOL()	2018-12-10 11:50:12 +00:00
mm	kasan: fix random seed generation for tag-based mode	2019-02-21 09:01:00 -08:00
net	arm64: bpf: implement jitting of JMP32	2019-01-26 13:33:02 -08:00
xen	arm64: mm: Add additional parameter to uaccess_ttbr0_disable	2018-01-17 13:57:49 +01:00
Kconfig	Kconfig file consolidation for v4.21	2018-12-29 13:40:29 -08:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Kconfig.platforms	ARM: SoC: late updates	2019-01-05 11:30:37 -08:00
Makefile	kasan, arm64: adjust shadow size for tag-based mode	2018-12-28 12:11:43 -08:00