David S. Miller a57066b1a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The UDP reuseport conflict was a little bit tricky. The net-next code, via bpf-next, extracted the reuseport handling into a helper so that the BPF sk lookup code could invoke it. At the same time, the logic for reuseport handling of unconnected sockets changed via commit efc6b6f6c3 which changed the logic to carry on the reuseport result into the rest of the lookup loop if we do not return immediately. This requires moving the reuseport_has_conns() logic into the callers. While we are here, get rid of inline directives as they do not belong in foo.c files. The other changes were cases of more straightforward overlapping modifications. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-25 17:49:04 -07:00
..
acpi	Merge branch 'acpica'	2020-06-10 17:27:28 +02:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
clocksource
crypto	crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock()	2020-06-18 17:09:54 +10:00
drm	drm/edid: Replace zero-length array with flexible-array	2020-06-15 23:08:31 -05:00
dt-bindings	- qcom :	2020-06-11 12:42:14 -07:00
keys	RxRPC: Replace zero-length array with flexible-array	2020-06-15 23:08:32 -05:00
kunit
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
math-emu
media	media updates for v5.8-rc1	2020-06-13 13:09:38 -07:00
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
pcmcia
ras
rdma	dynamic_debug: add an option to enable dynamic debug for modules only	2020-06-08 11:05:56 -07:00
scsi	SCSI misc on 20200605	2020-06-05 15:11:50 -07:00
soc	net: mscc: ocelot: extend watermark encoding function	2020-07-13 17:40:02 -07:00
sound	ASoC: Fixes for v5.8	2020-07-17 18:19:02 +02:00
target	scsi: target: Rename target_setup_cmd_from_cdb() to target_cmd_parse_cdb()	2020-06-09 21:57:26 -04:00
trace	bpf: cpumap: Implement XDP_REDIRECT for eBPF programs attached to map entries	2020-07-16 17:00:32 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
vdso
video
xen	xen: netif.h: add a new extra type for XDP	2020-07-01 15:25:14 -07:00