Merge tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.11-rc5, including fixes from bpf, wireless, and
  can trees.

  Current release - regressions:

   - nfc: nci: fix the wrong NCI_CORE_INIT parameters

  Current release - new code bugs:

   - bpf: allow empty module BTFs

  Previous releases - regressions:

   - bpf: fix signed_{sub,add32}_overflows type handling

   - tcp: do not mess with cloned skbs in tcp_add_backlog()

   - bpf: prevent double bpf_prog_put call from bpf_tracing_prog_attach

   - bpf: don't leak memory in bpf getsockopt when optlen == 0

   - tcp: fix potential use-after-free due to double kfree()

   - mac80211: fix encryption issues with WEP

   - devlink: use right genl user_ptr when handling port param get/set

   - ipv6: set multicast flag on the multicast route

   - tcp: fix TCP_USER_TIMEOUT with zero window

  Previous releases - always broken:

   - bpf: local storage helpers should check nullness of owner ptr passed

   - mac80211: fix incorrect strlen of .write in debugfs

   - cls_flower: call nla_ok() before nla_next()

   - skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too"

* tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (52 commits)
  net: systemport: free dev before on error path
  net: usb: cdc_ncm: don't spew notifications
  net: mscc: ocelot: Fix multicast to the CPU port
  tcp: Fix potential use-after-free due to double kfree()
  bpf: Fix signed_{sub,add32}_overflows type handling
  can: peak_usb: fix use after free bugs
  can: vxcan: vxcan_xmit: fix use after free bug
  can: dev: can_restart: fix use after free bug
  tcp: fix TCP socket rehash stats mis-accounting
  net: dsa: b53: fix an off by one in checking "vlan->vid"
  tcp: do not mess with cloned skbs in tcp_add_backlog()
  selftests: net: fib_tests: remove duplicate log test
  net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
  sh_eth: Fix power down vs. is_opened flag ordering
  net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled
  netfilter: rpfilter: mask ecn bits before fib lookup
  udp: mask TOS bits in udp_v4_early_demux()
  xsk: Clear pool even for inactive queues
  bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback
  sh_eth: Make PHY access aware of Runtime PM to fix reboot crash
  ...

diff --combined MAINTAINERS
index 00836f6452f044319e0334c6229cc9db87892ed8,4d3b2c934d68b7a75faa6841384283ad1659b482..705776b31c8de0f0124fe6515ba846710ec24287
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -906,7 -906,7 +906,7 @@@ AMD KF
  M:    Felix Kuehling <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
@@@ -3334,7 -3334,7 +3334,7 @@@ F:      arch/riscv/net
  X:    arch/riscv/net/bpf_jit_comp64.c
  
  BPF JIT for RISC-V (64-bit)
- M:    Björn Töpel <bjorn[email protected]>
+ M:    Björn Töpel <bjorn@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -14812,7 -14812,7 +14812,7 @@@ M:   Alex Deucher <alexander.deucher@amd.
  M:    Christian König <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
@@@ -16313,7 -16313,6 +16313,7 @@@ M:   Pekka Enberg <[email protected]
  M:    David Rientjes <[email protected]>
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
 +M:    Vlastimil Babka <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/sl?b*.h
@@@ -19416,7 -19415,7 +19416,7 @@@ F:   drivers/net/ethernet/*/*/*xdp
  K:    (?:\b|_)xdp(?:\b|_)
  
  XDP SOCKETS (AF_XDP)
- M:    Björn Töpel <bjorn[email protected]>
+ M:    Björn Töpel <bjorn@kernel.org>
  M:    Magnus Karlsson <[email protected]>
  R:    Jonathan Lemon <[email protected]>
  L:    [email protected]