linux_dsm_epyc7002/arch/arm64
David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-09 15:59:24 -04:00
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-09 15:59:24 -04:00
configs arm64: defconfig: updates for 4.6 2016-03-29 16:56:00 +01:00
crypto Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2016-03-17 11:22:54 -07:00
include KVM/ARM Fixes for v4.6-rc4 2016-04-08 14:17:27 +02:00
kernel arm64: Fix EL1/EL2 early init inconsistencies with VHE 2016-04-21 18:34:23 +01:00
kvm arm64: KVM: Warn when PARange is less than 40 bits 2016-04-06 13:33:14 +02:00
lib arm64 updates for 4.6: 2016-03-17 20:03:47 -07:00
mm 2nd set of arm64 updates for 4.6: 2016-03-24 19:13:59 -07:00
net arm64: bpf: add extra pass to handle faulty codegen 2016-01-17 19:15:26 -05:00
xen
Kconfig arm64 updates for 4.6: 2016-03-17 20:03:47 -07:00
Kconfig.debug arm64: enable CONFIG_DEBUG_RODATA by default 2016-03-03 18:14:17 +00:00
Kconfig.platforms Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-03-24 10:29:44 -07:00
Makefile arm64 updates for 4.6: 2016-03-17 20:03:47 -07:00