Commit 9bc62afe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Current release - regressions:

   - dsa: bcm_sf2: fix array overrun in bcm_sf2_num_active_ports()

  Previous releases - regressions:

   - introduce a shutdown method to mdio device drivers, and make DSA
     switch drivers compatible with masters disappearing on shutdown;
     preventing infinite reference wait

   - fix issues in mdiobus users related to ->shutdown vs ->remove

   - virtio-net: fix pages leaking when building skb in big mode

   - xen-netback: correct success/error reporting for the
     SKB-with-fraglist

   - dsa: tear down devlink port regions when tearing down the devlink
     port on error

   - nexthop: fix division by zero while replacing a resilient group

   - hns3: check queue, vf, vlan ids range before using

  Previous releases - always broken:

   - napi: fix race against netpoll causing NAPI getting stuck

   - mlx4_en: ensure link operstate is updated even if link comes up
     before netdev registration

   - bnxt_en: fix TX timeout when TX ring size is set to the smallest

   - enetc: fix illegal access when reading affinity_hint; prevent oops
     on sysfs access

   - mtk_eth_soc: avoid creating duplicate offload entries

  Misc:

   - core: correct the sock::sk_lock.owned lockdep annotations"

* tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (51 commits)
  atlantic: Fix issue in the pm resume flow.
  net/mlx4_en: Don't allow aRFS for encapsulated packets
  net: mscc: ocelot: fix forwarding from BLOCKING ports remaining enabled
  net: ethernet: mtk_eth_soc: avoid creating duplicate offload entries
  nfc: st-nci: Add SPI ID matching DT compatible
  MAINTAINERS: remove Guvenc Gulce as net/smc maintainer
  nexthop: Fix memory leaks in nexthop notification chain listeners
  mptcp: ensure tx skbs always have the MPTCP ext
  qed: rdma - don't wait for resources under hw error recovery flow
  s390/qeth: fix deadlock during failing recovery
  s390/qeth: Fix deadlock in remove_discipline
  s390/qeth: fix NULL deref in qeth_clear_working_pool_list()
  net: dsa: realtek: register the MDIO bus under devres
  net: dsa: don't allocate the slave_mii_bus using devres
  Doc: networking: Fox a typo in ice.rst
  net: dsa: fix dsa_tree_setup error path
  net/smc: fix 'workqueue leaked lock' in smc_conn_abort_work
  net/smc: add missing error check in smc_clc_prfx_set()
  net: hns3: fix a return value error in hclge_get_reset_status()
  net: hns3: check vlan id before using it
  ...
parents 1f828223 4d88c339

Documentation/networking/device_drivers/ethernet/intel/ice.rst

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ NOTES: 
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with

  the following command::



    # ethool -K <ethX> rxvlan off

    # ethtool -K <ethX> rxvlan off



- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS

  configured on the same port. 0x88a8/0x8100 traffic will not be received if

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -16955,7 +16955,6 @@ F: drivers/misc/sgi-xp/ 








SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS









M:	Karsten Graul <kgraul@linux.ibm.com>









M:	Guvenc Gulce <guvenc@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported









W:	http://www.ibm.com/developerworks/linux/linux390/


































arch/s390/include/asm/ccwgroup.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -55,7 +55,7 @@ int ccwgroup_create_dev(struct device *root, struct ccwgroup_driver *gdrv,







			int num_devices, const char *buf);



















extern int ccwgroup_set_online(struct ccwgroup_device *gdev);









extern int ccwgroup_set_offline(struct ccwgroup_device *gdev);









int ccwgroup_set_offline(struct ccwgroup_device *gdev, bool call_gdrv);



















extern int ccwgroup_probe_ccwdev(struct ccw_device *cdev);









extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev);


































drivers/net/dsa/b53/b53_mdio.c



+19
−2






























Original line number
Diff line number
Diff line







@@ -351,9 +351,25 @@ static int b53_mdio_probe(struct mdio_device *mdiodev)







static void b53_mdio_remove(struct mdio_device *mdiodev)









{









	struct b53_device *dev = dev_get_drvdata(&mdiodev->dev);









	struct dsa_switch *ds = dev->ds;



















	dsa_unregister_switch(ds);









	if (!dev)









		return;



















	b53_switch_remove(dev);



















	dev_set_drvdata(&mdiodev->dev, NULL);









}



















static void b53_mdio_shutdown(struct mdio_device *mdiodev)









{









	struct b53_device *dev = dev_get_drvdata(&mdiodev->dev);



















	if (!dev)









		return;



















	b53_switch_shutdown(dev);



















	dev_set_drvdata(&mdiodev->dev, NULL);









}



















static const struct of_device_id b53_of_match[] = {










@@ -373,6 +389,7 @@ MODULE_DEVICE_TABLE(of, b53_of_match);







static struct mdio_driver b53_mdio_driver = {









	.probe	= b53_mdio_probe,









	.remove	= b53_mdio_remove,









	.shutdown = b53_mdio_shutdown,









	.mdiodrv.driver = {









		.name = "bcm53xx",









		.of_match_table = b53_of_match,


































drivers/net/dsa/b53/b53_mmap.c



+13
−0






























Original line number
Diff line number
Diff line







@@ -316,9 +316,21 @@ static int b53_mmap_remove(struct platform_device *pdev)







	if (dev)









		b53_switch_remove(dev);



















	platform_set_drvdata(pdev, NULL);



















	return 0;









}



















static void b53_mmap_shutdown(struct platform_device *pdev)









{









	struct b53_device *dev = platform_get_drvdata(pdev);



















	if (dev)









		b53_switch_shutdown(dev);



















	platform_set_drvdata(pdev, NULL);









}



















static const struct of_device_id b53_mmap_of_table[] = {









	{ .compatible = "brcm,bcm3384-switch" },









	{ .compatible = "brcm,bcm6328-switch" },










@@ -331,6 +343,7 @@ MODULE_DEVICE_TABLE(of, b53_mmap_of_table);







static struct platform_driver b53_mmap_driver = {









	.probe = b53_mmap_probe,









	.remove = b53_mmap_remove,









	.shutdown = b53_mmap_shutdown,









	.driver = {









		.name = "b53-switch",









		.of_match_table = b53_mmap_of_table,