Commit 28b4387f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter.

  Current release - regressions:

   - sched: sch_taprio: do not schedule in taprio_reset()

  Previous releases - regressions:

   - core: fix UaF in netns ops registration error path

   - ipv4: prevent potential spectre v1 gadgets

   - ipv6: fix reachability confirmation with proxy_ndp

   - netfilter: fix for the set rbtree

   - eth: fec: use page_pool_put_full_page when freeing rx buffers

   - eth: iavf: fix temporary deadlock and failure to set MAC address

  Previous releases - always broken:

   - netlink: prevent potential spectre v1 gadgets

   - netfilter: fixes for SCTP connection tracking

   - mctp: struct sock lifetime fixes

   - eth: ravb: fix possible hang if RIS2_QFF1 happen

   - eth: tg3: resolve deadlock in tg3_reset_task() during EEH

  Misc:

   - Mat stepped out as MPTCP co-maintainer"

* tag 'net-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (40 commits)
  net: mdio-mux-meson-g12a: force internal PHY off on mux switch
  docs: networking: Fix bridge documentation URL
  tsnep: Fix TX queue stop/wake for multiple queues
  net/tg3: resolve deadlock in tg3_reset_task() during EEH
  net: mctp: mark socks as dead on unhash, prevent re-add
  net: mctp: hold key reference when looking up a general key
  net: mctp: move expiry timer delete to unhash
  net: mctp: add an explicit reference from a mctp_sk_key to sock
  net: ravb: Fix possible hang if RIS2_QFF1 happen
  net: ravb: Fix lack of register setting after system resumed for Gen3
  net/x25: Fix to not accept on connected socket
  ice: move devlink port creation/deletion
  sctp: fail if no bound addresses can be used for a given scope
  net/sched: sch_taprio: do not schedule in taprio_reset()
  Revert "Merge branch 'ethtool-mac-merge'"
  netrom: Fix use-after-free of a listening socket.
  netfilter: conntrack: unify established states for SCTP paths
  Revert "netfilter: conntrack: add sctp DATA_SENT state"
  netfilter: conntrack: fix bug in for_each_sctp_chunk
  netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE
  ...
parents 262b42e0 7083df59

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,13 @@ D: XF86_Mach8 
D: XF86_8514

D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA



N: John S. Marvin

E: jsm@fc.hp.com

D: PA-RISC port

Documentation/networking/bridge.rst

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ In order to use the Ethernet bridging functionality, you'll need the 
userspace tools.



Documentation for Linux bridging is on:

   http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge

   https://wiki.linuxfoundation.org/networking/bridge



The bridge-utilities are maintained at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git

Documentation/networking/nf_conntrack-sysctl.rst

+3 −7
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ nf_conntrack_sctp_timeout_cookie_echoed - INTEGER (seconds) 
	default 3



nf_conntrack_sctp_timeout_established - INTEGER (seconds)

	default 432000 (5 days)

	default 210



	Default is set to (hb_interval * path_max_retrans + rto_max)



nf_conntrack_sctp_timeout_shutdown_sent - INTEGER (seconds)

	default 0.3
@@ -190,12 +192,6 @@ nf_conntrack_sctp_timeout_heartbeat_sent - INTEGER (seconds) 
	This timeout is used to setup conntrack entry on secondary paths.

	Default is set to hb_interval.



nf_conntrack_sctp_timeout_heartbeat_acked - INTEGER (seconds)

	default 210



	This timeout is used to setup conntrack entry on secondary paths.

	Default is set to (hb_interval * path_max_retrans + rto_max)



nf_conntrack_udp_timeout - INTEGER (seconds)

	default 30

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14632,7 +14632,6 @@ F: net/netfilter/xt_SECMARK.c 
F:	net/netlabel/









NETWORKING [MPTCP]









M:	Mat Martineau <mathew.j.martineau@linux.intel.com>









M:	Matthieu Baerts <matthieu.baerts@tessares.net>









L:	netdev@vger.kernel.org









L:	mptcp@lists.linux.dev
































drivers/net/dsa/microchip/ksz9477_i2c.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -104,7 +104,7 @@ static const struct of_device_id ksz9477_dt_ids[] = {







	},









	{









		.compatible = "microchip,ksz8563",









		.data = &ksz_switch_chips[KSZ9893]









		.data = &ksz_switch_chips[KSZ8563]









	},









	{









		.compatible = "microchip,ksz9567",