Commit 0a80e38d authored Jan 22, 2026 by Linus Torvalds

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

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

  Pretty big, but hard to make up any cohesive story that would explain
  it, a random collection of fixes. The two reverts of bad patches from
  this release here feel like stuff that'd normally show up by rc5 or
  rc6. Perhaps obvious thing to say, given the holiday timing.

  That said, no active investigations / regressions. Let's see what the
  next week brings.

  Current release - fix to a fix:

   - can: alloc_candev_mqs(): add missing default CAN capabilities

  Current release - regressions:

   - usbnet: fix crash due to missing BQL accounting after resume

   - Revert "net: wwan: mhi_wwan_mbim: Avoid -Wflex-array-member-not ...

  Previous releases - regressions:

   - Revert "nfc/nci: Add the inconsistency check between the input ...

  Previous releases - always broken:

   - number of driver fixes for incorrect use of seqlocks on stats

   - rxrpc: fix recvmsg() unconditional requeue, don't corrupt rcv queue
     when MSG_PEEK was set

   - ipvlan: make the addrs_lock be per port avoid races in the port
     hash table

   - sched: enforce that teql can only be used as root qdisc

   - virtio: coalesce only linear skb

   - wifi: ath12k: fix dead lock while flushing management frames

   - eth: igc: reduce TSN TX packet buffer from 7KB to 5KB per queue"

* tag 'net-6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (96 commits)
  Octeontx2-af: Add proper checks for fwdata
  dpll: Prevent duplicate registrations
  net/sched: act_ife: avoid possible NULL deref
  hinic3: Fix netif_queue_set_napi queue_index input parameter error
  vsock/test: add stream TX credit bounds test
  vsock/virtio: cap TX credit to local buffer size
  vsock/test: fix seqpacket message bounds test
  vsock/virtio: fix potential underflow in virtio_transport_get_credit()
  net: fec: account for VLAN header in frame length calculations
  net: openvswitch: fix data race in ovs_vport_get_upcall_stats
  octeontx2-af: Fix error handling
  net: pcs: pcs-mtk-lynxi: report in-band capability for 2500Base-X
  rxrpc: Fix data-race warning and potential load/store tearing
  net: dsa: fix off-by-one in maximum bridge ID determination
  net: bcmasp: Fix network filter wake for asp-3.0
  bonding: provide a net pointer to __skb_flow_dissect()
  selftests: net: amt: wait longer for connection before sending packets
  be2net: Fix NULL pointer dereference in be_cmd_get_mac_from_list
  Revert "net: wwan: mhi_wwan_mbim: Avoid -Wflex-array-member-not-at-end warning"
  netrom: fix double-free in nr_route_frame()
  ...

parents 0309fc3c 4a3dba48

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -2231,6 +2231,10 @@ S: Markham, Ontario
		S: L3R 8B2
		S: Canada

		N: Krzysztof Kozlowski
		E: krzk@kernel.org
		D: NFC network subsystem and drivers maintainer

		N: Christian Krafft
		D: PowerPC Cell support

Documentation/netlink/specs/fou.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ attribute-sets:
		-
		name: ipproto
		type: u8
		checks:
		min: 1
		-
		name: type
		type: u8

Documentation/process/maintainer-netdev.rst

+12 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,18 @@ just do it. As a result, a sequence of smaller series gets merged quicker and
		with better review coverage. Re-posting large series also increases the mailing
		list traffic.

		Limit patches outstanding on mailing list
		-----------------------------------------

		Avoid having more than 15 patches, across all series, outstanding for
		review on the mailing list for a single tree. In other words, a maximum of
		15 patches under review on net, and a maximum of 15 patches under review on
		net-next.

		This limit is intended to focus developer effort on testing patches before
		upstream review. Aiding the quality of upstream submissions, and easing the
		load on reviewers.

		.. _rcs:

		Local variable ordering ("reverse xmas tree", "RCS")

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -18486,9 +18486,8 @@ F: include/uapi/linux/nexthop.h
		F: net/ipv4/nexthop.c

		NFC SUBSYSTEM
		M: Krzysztof Kozlowski <krzk@kernel.org>
		L: netdev@vger.kernel.org
		S: Maintained
		S: Orphan
		F: Documentation/devicetree/bindings/net/nfc/
		F: drivers/nfc/
		F: include/net/nfc/

drivers/dpll/dpll_core.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -83,10 +83,8 @@ dpll_xa_ref_pin_add(struct xarray xa_pins, struct dpll_pin pin,
		if (ref->pin != pin)
		continue;
		reg = dpll_pin_registration_find(ref, ops, priv, cookie);
		if (reg) {
		refcount_inc(&ref->refcount);
		return 0;
		}
		if (reg)
		return -EEXIST;
		ref_exists = true;
		break;
		}
		@@ -164,10 +162,8 @@ dpll_xa_ref_dpll_add(struct xarray xa_dplls, struct dpll_device dpll,
		if (ref->dpll != dpll)
		continue;
		reg = dpll_pin_registration_find(ref, ops, priv, cookie);
		if (reg) {
		refcount_inc(&ref->refcount);
		return 0;
		}
		if (reg)
		return -EEXIST;
		ref_exists = true;
		break;
		}