David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04: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	* ARM/ARM64 locking fixes	2018-05-17 10:23:36 -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: save 4 bytes in prologue when ebpf insns came from cbpf	2018-05-14 19:11:45 -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