Commit c77cd47c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter, Bluetooth and WPAN.

  No outstanding fixes / investigations at this time.

  Current release - new code bugs:

   - eth: fbnic: revert HWMON support, it doesn't work at all and revert
     is similar size as the fixes

  Previous releases - regressions:

   - tcp: allow a connection when sk_max_ack_backlog is zero

   - tls: fix tls_sw_sendmsg error handling

  Previous releases - always broken:

   - netdev netlink family:
       - prevent accessing NAPI instances from another namespace
       - don't dump Tx and uninitialized NAPIs

   - net: sysctl: avoid using current->nsproxy, fix null-deref if task
     is exiting and stick to opener's netns

   - sched: sch_cake: add bounds checks to host bulk flow fairness
     counts

  Misc:

   - annual cleanup of inactive maintainers"

* tag 'net-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
  rds: sysctl: rds_tcp_{rcv,snd}buf: avoid using current->nsproxy
  sctp: sysctl: plpmtud_probe_interval: avoid using current->nsproxy
  sctp: sysctl: udp_port: avoid using current->nsproxy
  sctp: sysctl: auth_enable: avoid using current->nsproxy
  sctp: sysctl: rto_min/max: avoid using current->nsproxy
  sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy
  mptcp: sysctl: blackhole timeout: avoid using current->nsproxy
  mptcp: sysctl: sched: avoid using current->nsproxy
  mptcp: sysctl: avail sched: remove write access
  MAINTAINERS: remove Lars Povlsen from Microchip Sparx5 SoC
  MAINTAINERS: remove Noam Dagan from AMAZON ETHERNET
  MAINTAINERS: remove Ying Xue from TIPC
  MAINTAINERS: remove Mark Lee from MediaTek Ethernet
  MAINTAINERS: mark stmmac ethernet as an Orphan
  MAINTAINERS: remove Andy Gospodarek from bonding
  MAINTAINERS: update maintainers for Microchip LAN78xx
  MAINTAINERS: mark Synopsys DW XPCS as Orphan
  net/mlx5: Fix variable not being completed when function returns
  rtase: Fix a check for error in rtase_alloc_msix()
  net: stmmac: dwmac-tegra: Read iommu stream id from device tree
  ...
parents 643e2e25 b5cf67a8

CREDITS

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ N: Thomas Abraham 
E: thomas.ab@samsung.com

D: Samsung pin controller driver



N: Jose Abreu

E: jose.abreu@synopsys.com

D: Synopsys DesignWare XPCS MDIO/PCS driver.



N: Dragos Acostachioaie

E: dragos@iname.com

W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7 
S: Sterling Heights, Michigan 48313

S: USA



N: Andy Gospodarek

E: andy@greyhouse.net

D: Maintenance and contributions to the network interface bonding driver.



N: Wolfgang Grandegger

E: wg@grandegger.com

D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA) 
D: Core DRM templates, general DRM and 3D-related hacking

S: No fixed address



N: Woojung Huh

E: woojung.huh@microchip.com

D: Microchip LAN78XX USB Ethernet driver



N: Kenn Humborg

E: kenn@wombat.ie

D: Mods to loop device to support sparse backing files

Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ properties: 
              List of phandles, each pointing to the power supply for the

              corresponding pairset named in 'pairset-names'. This property

              aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4.

              PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133)

              PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145-3)

              |-----------|---------------|---------------|---------------|---------------|

              | Conductor | Alternative A | Alternative A | Alternative B | Alternative B |

              |           |    (MDI-X)    |     (MDI)     |      (X)      |      (S)      |

MAINTAINERS

+4 −12
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ AMAZON ETHERNET DRIVERS 
M:	Shay Agroskin <shayagr@amazon.com>

M:	Arthur Kiyanovski <akiyano@amazon.com>

R:	David Arinzon <darinzon@amazon.com>

R:	Noam Dagan <ndagan@amazon.com>

R:	Saeed Bishara <saeedb@amazon.com>

L:	netdev@vger.kernel.org

S:	Supported
@@ -2690,7 +2689,6 @@ N: at91 
N:	atmel









ARM/Microchip Sparx5 SoC support









M:	Lars Povlsen <lars.povlsen@microchip.com>









M:	Steen Hegelund <Steen.Hegelund@microchip.com>









M:	Daniel Machon <daniel.machon@microchip.com>









M:	UNGLinuxDriver@microchip.com








@@ -4058,7 +4056,6 @@ F:	net/bluetooth/















BONDING DRIVER









M:	Jay Vosburgh <jv@jvosburgh.net>









M:	Andy Gospodarek <andy@greyhouse.net>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/networking/bonding.rst








@@ -14566,7 +14563,6 @@ F:	drivers/dma/mediatek/







MEDIATEK ETHERNET DRIVER









M:	Felix Fietkau <nbd@nbd.name>









M:	Sean Wang <sean.wang@mediatek.com>









M:	Mark Lee <Mark-MC.Lee@mediatek.com>









M:	Lorenzo Bianconi <lorenzo@kernel.org>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -22503,11 +22499,8 @@ F:	Documentation/devicetree/bindings/phy/st,stm32mp25-combophy.yaml







F:	drivers/phy/st/phy-stm32-combophy.c

















STMMAC ETHERNET DRIVER









M:	Alexandre Torgue <alexandre.torgue@foss.st.com>









M:	Jose Abreu <joabreu@synopsys.com>









L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.stlinux.com









S:	Orphan









F:	Documentation/networking/device_drivers/ethernet/stmicro/









F:	drivers/net/ethernet/stmicro/stmmac/
















@@ -22739,9 +22732,8 @@ S:	Supported







F:	drivers/net/ethernet/synopsys/

















SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER









M:	Jose Abreu <Jose.Abreu@synopsys.com>









L:	netdev@vger.kernel.org









S:	Supported









S:	Orphan









F:	drivers/net/pcs/pcs-xpcs.c









F:	drivers/net/pcs/pcs-xpcs.h









F:	include/linux/pcs/pcs-xpcs.h








@@ -23649,7 +23641,6 @@ F:	tools/testing/selftests/timers/















TIPC NETWORK LAYER









M:	Jon Maloy <jmaloy@redhat.com>









M:	Ying Xue <ying.xue@windriver.com>









L:	netdev@vger.kernel.org (core kernel code)









L:	tipc-discussion@lists.sourceforge.net (user apps, general discussion)









S:	Maintained








@@ -24255,7 +24246,8 @@ F:	Documentation/devicetree/bindings/usb/nxp,isp1760.yaml







F:	drivers/usb/isp1760/*

















USB LAN78XX ETHERNET DRIVER









M:	Woojung Huh <woojung.huh@microchip.com>









M:	Thangaraj Samynathan <Thangaraj.S@microchip.com>









M:	Rengarajan Sundararajan <Rengarajan.S@microchip.com>









M:	UNGLinuxDriver@microchip.com









L:	netdev@vger.kernel.org









S:	Maintained

























drivers/bluetooth/btmtk.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -1472,10 +1472,15 @@ EXPORT_SYMBOL_GPL(btmtk_usb_setup);

















int btmtk_usb_shutdown(struct hci_dev *hdev)









{









	struct btmtk_data *data = hci_get_priv(hdev);









	struct btmtk_hci_wmt_params wmt_params;









	u8 param = 0;









	int err;



















	err = usb_autopm_get_interface(data->intf);









	if (err < 0)









		return err;



















	/* Disable the device */









	wmt_params.op = BTMTK_WMT_FUNC_CTRL;









	wmt_params.flag = 0;








@@ -1486,9 +1491,11 @@ int btmtk_usb_shutdown(struct hci_dev *hdev)







	err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);









	if (err < 0) {









		bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);









		usb_autopm_put_interface(data->intf);









		return err;









	}



















	usb_autopm_put_interface(data->intf);









	return 0;









}









EXPORT_SYMBOL_GPL(btmtk_usb_shutdown);
































drivers/bluetooth/btnxpuart.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1381,6 +1381,7 @@ static void btnxpuart_tx_work(struct work_struct *work)

















	while ((skb = nxp_dequeue(nxpdev))) {









		len = serdev_device_write_buf(serdev, skb->data, skb->len);









		serdev_device_wait_until_sent(serdev, 0);









		hdev->stat.byte_tx += len;



















		skb_pull(skb, len);