Received-SPF: pass (google.com: domain of linux-kernel+bounces-182607-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Jakub Kicinski <kuba@kernel.org>
To: torvalds@linux-foundation.org
Cc: kuba@kernel.org,
	davem@davemloft.net,
	netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	pabeni@redhat.com
Subject: [GIT PULL] Networking merge window fixes
Date: Fri, 17 May 2024 13:14:25 -0700
Message-ID: <20240517201425.3080823-1-kuba@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi Linus!

The following changes since commit 1b294a1f35616977caddaddf3e9d28e576a1adbc:

  Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2024-05-14 19:42:24 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-6.10-rc0

for you to fetch changes up to fe56d6e4a99a40f50e64d5a8043f1fa838b1f7a1:

  selftests: net: local_termination: annotate the expected failures (2024-05-17 12:26:35 -0700)

----------------------------------------------------------------
Including fix from Andrii for the issue mentioned in our net-next PR,
the rest is unremarkable.

Current release - regressions:

 - virtio_net: fix missed error path rtnl_unlock after control queue
   locking rework

Current release - new code bugs:

 - bpf: fix KASAN slab-out-of-bounds in percpu_array_map_gen_lookup,
   caused by missing nested map handling

 - drv: dsa: correct initialization order for KSZ88x3 ports

Previous releases - regressions:

 - af_packet: do not call packet_read_pending() from tpacket_destruct_skb()
   fix performance regression

 - ipv6: fix route deleting failure when metric equals 0, don't assume
   0 means not set / default in this case

Previous releases - always broken:

 - bridge: couple of syzbot-driven fixes

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

----------------------------------------------------------------
Andrii Nakryiko (3):
      libbpf: fix feature detectors when using token_fd
      bpf: save extended inner map info for percpu array maps as well
      selftests/bpf: add more variations of map-in-map situations

Chris Lew (1):
      net: qrtr: ns: Fix module refcnt

Daniel Jurgens (1):
      virtio_net: Fix missed rtnl_unlock

David S. Miller (1):
      Merge branch 'wangxun-fixes'

Eric Dumazet (2):
      netrom: fix possible dead-lock in nr_rt_ioctl()
      af_packet: do not call packet_read_pending() from tpacket_destruct_skb()

Hangbin Liu (2):
      selftests/net/lib: no need to record ns name if it already exist
      selftests/net: reduce xfrm_policy test time

Herve Codina (1):
      net: lan966x: remove debugfs directory in probe() error path

Jakub Kicinski (3):
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
      Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
      selftests: net: local_termination: annotate the expected failures

Jiawen Wu (3):
      net: wangxun: fix to change Rx features
      net: wangxun: match VLAN CTAG and STAG features
      net: txgbe: fix to control VLAN strip

Martin KaFai Lau (2):
      selftests/bpf: Adjust test_access_variable_array after a kernel function name change
      selftests/bpf: Adjust btf_dump test to reflect recent change in file_operations

Michal Schmidt (1):
      idpf: don't skip over ethtool tcp-data-split setting

Nikolay Aleksandrov (3):
      net: bridge: xmit: make sure we have at least eth header len bytes
      selftests: net: bridge: increase IGMP/MLD exclude timeout membership interval
      net: bridge: mst: fix vlan use-after-free

Oleksij Rempel (1):
      net: dsa: microchip: Correct initialization order for KSZ88x3 ports

Puranjay Mohan (2):
      bpf, docs: Fix the description of 'src' in ALU instructions
      MAINTAINERS: Update ARM64 BPF JIT maintainer

Ravi Gunasekaran (2):
      dt-bindings: net: ti: Update maintainers list
      MAINTAINERS: net: Update reviewers for TI's Ethernet drivers

Ronald Wahl (1):
      net: ks8851: Fix another TX stall caused by wrong ISR flag handling

Sagar Cheluvegowda (1):
      dt-bindings: net: qcom: ethernet: Allow dma-coherent

Tom Parkin (1):
      l2tp: fix ICMP error handling for UDP-encap sockets

Tony Battersby (1):
      bonding: fix oops during rmmod

xu xin (1):
      net/ipv6: Fix route deleting failure when metric equals 0

 .../bpf/standardization/instruction-set.rst        |  5 +-
 .../devicetree/bindings/net/qcom,ethqos.yaml       |  2 +
 .../devicetree/bindings/net/ti,cpsw-switch.yaml    |  1 -
 .../bindings/net/ti,k3-am654-cpsw-nuss.yaml        |  1 -
 .../devicetree/bindings/net/ti,k3-am654-cpts.yaml  |  1 -
 MAINTAINERS                                        |  3 +-
 drivers/net/bonding/bond_main.c                    | 13 ++---
 drivers/net/dsa/microchip/ksz_dcb.c                | 10 ++++
 drivers/net/ethernet/intel/idpf/idpf_ethtool.c     |  3 +-
 drivers/net/ethernet/micrel/ks8851_common.c        | 18 +------
 .../net/ethernet/microchip/lan966x/lan966x_main.c  |  6 ++-
 drivers/net/ethernet/wangxun/libwx/wx_hw.c         |  2 +
 drivers/net/ethernet/wangxun/libwx/wx_lib.c        | 56 ++++++++++++++++++++--
 drivers/net/ethernet/wangxun/libwx/wx_lib.h        |  2 +
 drivers/net/ethernet/wangxun/libwx/wx_type.h       | 22 +++++++++
 drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c   | 18 +++++--
 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c      |  1 +
 drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 18 +++++--
 drivers/net/ethernet/wangxun/txgbe/txgbe_main.c    | 31 ++++++++++++
 drivers/net/ethernet/wangxun/txgbe/txgbe_type.h    |  1 +
 drivers/net/virtio_net.c                           |  6 +--
 kernel/bpf/map_in_map.c                            |  4 +-
 net/bridge/br_device.c                             |  6 +++
 net/bridge/br_mst.c                                | 16 ++++---
 net/ipv6/route.c                                   |  5 +-
 net/l2tp/l2tp_core.c                               | 44 ++++++++++++-----
 net/netrom/nr_route.c                              | 19 +++-----
 net/packet/af_packet.c                             |  3 +-
 net/qrtr/ns.c                                      | 27 +++++++++++
 tools/lib/bpf/bpf.c                                |  2 +-
 tools/lib/bpf/features.c                           |  2 +-
 tools/testing/selftests/bpf/prog_tests/btf_dump.c  |  2 +-
 tools/testing/selftests/bpf/progs/map_kptr.c       | 10 ++++
 .../bpf/progs/test_access_variable_array.c         |  2 +-
 .../selftests/net/forwarding/bridge_igmp.sh        |  6 +--
 .../testing/selftests/net/forwarding/bridge_mld.sh |  6 +--
 .../selftests/net/forwarding/local_termination.sh  | 30 +++++++-----
 tools/testing/selftests/net/lib.sh                 |  6 ++-
 tools/testing/selftests/net/xfrm_policy.sh         |  4 +-
 39 files changed, 304 insertions(+), 110 deletions(-)