Commit 57ce6427 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc8 ("ipv4: fix data-races around inet->inet_id")
  c274af22 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/



Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8 ("bonding: fix macvlan over alb bond support")
  f11e5bd1 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488 ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1a ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc8 ("ipv4: fix data-races around inet->inet_id")
  b09bde5c ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9f6708a6 b5cc3833

Documentation/ABI/testing/sysfs-class-led-trigger-netdev

+10 −10
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Description: 
		Specifies the duration of the LED blink in milliseconds.

		Defaults to 50 ms.



		With hw_control ON, the interval value MUST be set to the

		When offloaded is true, the interval value MUST be set to the

		default value and cannot be changed.

		Trying to set any value in this specific mode will return

		an EINVAL error.
@@ -44,8 +44,8 @@ Description: 
		If set to 1, the LED will blink for the milliseconds specified

		in interval to signal transmission.



		With hw_control ON, the blink interval is controlled by hardware

		and won't reflect the value set in interval.

		When offloaded is true, the blink interval is controlled by

		hardware and won't reflect the value set in interval.



What:		/sys/class/leds/<led>/rx

Date:		Dec 2017
@@ -59,21 +59,21 @@ Description: 
		If set to 1, the LED will blink for the milliseconds specified

		in interval to signal reception.



		With hw_control ON, the blink interval is controlled by hardware

		and won't reflect the value set in interval.

		When offloaded is true, the blink interval is controlled by

		hardware and won't reflect the value set in interval.



What:		/sys/class/leds/<led>/hw_control

What:		/sys/class/leds/<led>/offloaded

Date:		Jun 2023

KernelVersion:	6.5

Contact:	linux-leds@vger.kernel.org

Description:

		Communicate whether the LED trigger modes are driven by hardware

		or software fallback is used.

		Communicate whether the LED trigger modes are offloaded to

		hardware or whether software fallback is used.



		If 0, the LED is using software fallback to blink.



		If 1, the LED is using hardware control to blink and signal the

		requested modes.

		If 1, the LED blinking in requested mode is offloaded to

		hardware.



What:		/sys/class/leds/<led>/link_10

Date:		Jun 2023

Documentation/admin-guide/hw-vuln/srso.rst

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ sequence. 
To ensure the safety of this mitigation, the kernel must ensure that the

safe return sequence is itself free from attacker interference.  In Zen3

and Zen4, this is accomplished by creating a BTB alias between the

untraining function srso_untrain_ret_alias() and the safe return

function srso_safe_ret_alias() which results in evicting a potentially

untraining function srso_alias_untrain_ret() and the safe return

function srso_alias_safe_ret() which results in evicting a potentially

poisoned BTB entry and using that safe one for all function returns.



In older Zen1 and Zen2, this is accomplished using a reinterpretation

Documentation/devicetree/bindings/pinctrl/qcom,sa8775p-tlmm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ $defs: 
                emac0_mdc, emac0_mdio, emac0_ptp_aux, emac0_ptp_pps, emac1_mcg0,

                emac1_mcg1, emac1_mcg2, emac1_mcg3, emac1_mdc, emac1_mdio,

                emac1_ptp_aux, emac1_ptp_pps, gcc_gp1, gcc_gp2, gcc_gp3,

                gcc_gp4, gcc_gp5, hs0_mi2s, hs1_mi2s, hs2_mi2s, ibi_i3c,

                gcc_gp4, gcc_gp5, gpio, hs0_mi2s, hs1_mi2s, hs2_mi2s, ibi_i3c,

                jitter_bist, mdp0_vsync0, mdp0_vsync1, mdp0_vsync2, mdp0_vsync3,

                mdp0_vsync4, mdp0_vsync5, mdp0_vsync6, mdp0_vsync7, mdp0_vsync8,

                mdp1_vsync0, mdp1_vsync1, mdp1_vsync2, mdp1_vsync3, mdp1_vsync4,

Documentation/i2c/writing-clients.rst

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ driver model device node, and its I2C address. 
	},



	.id_table	= foo_idtable,

	.probe_new	= foo_probe,

	.probe		= foo_probe,

	.remove		= foo_remove,

	/* if device autodetection is needed: */

	.class		= I2C_CLASS_SOMETHING,

MAINTAINERS

+13 −13
Original line number Diff line number Diff line
@@ -8831,6 +8831,7 @@ R: Michael Walle <michael@walle.cc> 
S:	Maintained

F:	drivers/gpio/gpio-regmap.c

F:	include/linux/gpio/regmap.h

K:	(devm_)?gpio_regmap_(un)?register









GPIO SUBSYSTEM









M:	Linus Walleij <linus.walleij@linaro.org>








@@ -14821,6 +14822,16 @@ F:	net/netfilter/xt_CONNSECMARK.c







F:	net/netfilter/xt_SECMARK.c









F:	net/netlabel/

















NETWORKING [MACSEC]









M:	Sabrina Dubroca <sd@queasysnail.net>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/macsec.c









F:	include/net/macsec.h









F:	include/uapi/linux/if_macsec.h









K:	macsec









K:	\bmdo_

















NETWORKING [MPTCP]









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









M:	Mat Martineau <martineau@kernel.org>








@@ -19249,13 +19260,6 @@ F:	Documentation/devicetree/bindings/serial/serial.yaml







F:	drivers/tty/serdev/









F:	include/linux/serdev.h

















SERIAL DRIVERS









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	linux-serial@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/serial/









F:	drivers/tty/serial/

















SERIAL IR RECEIVER









M:	Sean Young <sean@mess.org>









L:	linux-media@vger.kernel.org








@@ -21660,20 +21664,16 @@ W:	https://github.com/srcres258/linux-doc







T:	git git://github.com/srcres258/linux-doc.git doc-zh-tw









F:	Documentation/translations/zh_TW/

















TTY LAYER









TTY LAYER AND SERIAL DRIVERS









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









M:	Jiri Slaby <jirislaby@kernel.org>









L:	linux-kernel@vger.kernel.org









L:	linux-serial@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git









F:	Documentation/devicetree/bindings/serial/









F:	Documentation/driver-api/serial/









F:	drivers/tty/









F:	drivers/tty/serial/serial_base.h









F:	drivers/tty/serial/serial_base_bus.c









F:	drivers/tty/serial/serial_core.c









F:	drivers/tty/serial/serial_ctrl.c









F:	drivers/tty/serial/serial_port.c









F:	include/linux/selection.h









F:	include/linux/serial.h









F:	include/linux/serial_core.h