David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The bpf syscall and selftests conflicts were trivial overlapping changes. The r8169 change involved moving the added mdelay from 'net' into a different function. A TLS close bug fix overlapped with the splitting of the TLS state into separate TX and RX parts. I just expanded the tests in the bug fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf == X". Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-11 20:53:22 -04:00
..
boot	This pull request contains Broadcom ARM64-based SoCs Device Tree fixes	2018-04-27 10:21:18 +02:00
configs	arm64: defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVE	2018-03-27 15:31:19 +02:00
crypto	kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers	2018-04-07 19:04:02 +09:00
include	arm64 fixes:	2018-05-11 13:09:04 -07:00
kernel	arm64: capabilities: Add NVIDIA Denver CPU to bp_harden list	2018-05-09 14:28:28 +01:00
kvm	arm64: vgic-v2: Fix proxying of cpuif access	2018-05-04 16:45:55 +01:00
lib	arm64: avoid instrumenting atomic_ll_sc.o	2018-04-27 12:14:44 +01:00
mm	arm64: To remove initrd reserved area entry from memblock	2018-05-01 10:19:30 +01:00
net	bpf, arm64: remove ld_abs/ld_ind	2018-05-03 16:49:19 -07:00
xen	arm64: mm: Add additional parameter to uaccess_ttbr0_disable	2018-01-17 13:57:49 +01:00
Kconfig	ARM:	2018-04-09 11:42:31 -07:00
Kconfig.debug	arm64: relocation testing module	2017-04-04 17:03:32 +01:00
Kconfig.platforms	arm64: add Renesas R8A77965 support	2018-03-13 19:05:58 +01:00
Makefile	arm64: support __int128 with clang	2018-04-24 19:07:55 +01:00