Commit 5c8013ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless.

  The ath12k fix to avoid FW crashes requires adding support for a
  number of new FW commands so it's quite large in terms of LoC. The
  rest is relatively small.

  Current release - fix to a fix:

   - ptp: fix breakage after ptp_vclock_in_use() rework

  Current release - regressions:

   - openvswitch: allocate struct ovs_pcpu_storage dynamically, static
     allocation may exhaust module loader limit on smaller systems

  Previous releases - regressions:

   - tcp: fix tcp_packet_delayed() for peers with no selective ACK
     support

  Previous releases - always broken:

   - wifi: ath12k: don't activate more links than firmware supports

   - tcp: make sure sockets open via passive TFO have valid NAPI ID

   - eth: bnxt_en: update MRU and RSS table of RSS contexts on queue
     reset, prevent Rx queues from silently hanging after queue reset

   - NFC: uart: set tty->disc_data only in success path"

* tag 'net-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (59 commits)
  net: airoha: Differentiate hwfd buffer size for QDMA0 and QDMA1
  net: airoha: Compute number of descriptors according to reserved memory size
  tools: ynl: fix mixing ops and notifications on one socket
  net: atm: fix /proc/net/atm/lec handling
  net: atm: add lec_mutex
  mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available
  net: airoha: Always check return value from airoha_ppe_foe_get_entry()
  NFC: nci: uart: Set tty->disc_data only in success path
  calipso: Fix null-ptr-deref in calipso_req_{set,del}attr().
  MAINTAINERS: Remove Shannon Nelson from MAINTAINERS file
  net: lan743x: fix potential out-of-bounds write in lan743x_ptp_io_event_clock_get()
  eth: fbnic: avoid double free when failing to DMA-map FW msg
  tcp: fix passive TFO socket having invalid NAPI ID
  selftests: net: add test for passive TFO socket NAPI ID
  selftests: net: add passive TFO test binary
  selftests: netdevsim: improve lib.sh include in peer.sh
  tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer
  Octeontx2-pf: Fix Backpresure configuration
  net: ftgmac100: select FIXED_PHY
  net: ethtool: remove duplicate defines for family info
  ...
parents 24770983 16ef63ac

.mailmap

+4 −3
Original line number Diff line number Diff line
@@ -693,9 +693,10 @@ Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com> 
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>

Shannon Nelson <sln@onemain.com> <snelson@pensando.io>

Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@oracle.com>

Sharath Chandra Vurukala <quic_sharathv@quicinc.com> <sharathv@codeaurora.org>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Documentation/netlink/specs/ethtool.yaml

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ protocol: genetlink-legacy 
doc: Partial family for Ethtool Netlink.

uapi-header: linux/ethtool_netlink_generated.h



c-family-name: ethtool-genl-name

c-version-name: ethtool-genl-version



definitions:

  -

    name: udp-tunnel-type

MAINTAINERS

+1 −4
Original line number Diff line number Diff line
@@ -1157,7 +1157,6 @@ F: arch/x86/include/asm/amd/node.h 
F:	arch/x86/kernel/amd_node.c









AMD PDS CORE DRIVER









M:	Shannon Nelson <shannon.nelson@amd.com>









M:	Brett Creeley <brett.creeley@amd.com>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -9942,7 +9941,6 @@ F:	drivers/fwctl/mlx5/















FWCTL PDS DRIVER









M:	Brett Creeley <brett.creeley@amd.com>









R:	Shannon Nelson <shannon.nelson@amd.com>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	drivers/fwctl/pds/








@@ -19379,7 +19377,7 @@ F:	crypto/pcrypt.c







F:	include/crypto/pcrypt.h

















PDS DSC VIRTIO DATA PATH ACCELERATOR









R:	Shannon Nelson <shannon.nelson@amd.com>









R:	Brett Creeley <brett.creeley@amd.com>









F:	drivers/vdpa/pds/

















PECI HARDWARE MONITORING DRIVERS








@@ -19401,7 +19399,6 @@ F:	include/linux/peci-cpu.h







F:	include/linux/peci.h

















PENSANDO ETHERNET DRIVERS









M:	Shannon Nelson <shannon.nelson@amd.com>









M:	Brett Creeley <brett.creeley@amd.com>









L:	netdev@vger.kernel.org









S:	Maintained

























drivers/atm/atmtcp.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -288,7 +288,9 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)







	struct sk_buff *new_skb;









	int result = 0;



















	if (!skb->len) return 0;









	if (skb->len < sizeof(struct atmtcp_hdr))









		goto done;



















	dev = vcc->dev_data;









	hdr = (struct atmtcp_hdr *) skb->data;









	if (hdr->length == ATMTCP_HDR_MAGIC) {
































drivers/net/can/m_can/tcan4x5x-core.c



+5
−4






























Original line number
Diff line number
Diff line







@@ -411,10 +411,11 @@ static int tcan4x5x_can_probe(struct spi_device *spi)







	priv = cdev_to_priv(mcan_class);



















	priv->power = devm_regulator_get_optional(&spi->dev, "vsup");









	if (IS_ERR(priv->power)) {









		if (PTR_ERR(priv->power) == -EPROBE_DEFER) {









			ret = -EPROBE_DEFER;









			goto out_m_can_class_free_dev;









	} else {









		}









		priv->power = NULL;









	}