Commit 4d3d3559 authored Aug 08, 2024 by Jakub Kicinski

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

Cross-merge networking fixes after downstream PR.

Conflicts:

Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
  c25504a0 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys")
  be034ee6 ("dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties")
https://lore.kernel.org/20240815110934.56ae623a@canb.auug.org.au

drivers/net/dsa/vitesse-vsc73xx-core.c
  5b9eebc2 ("net: dsa: vsc73xx: pass value in phy_write operation")
  fa63c643 ("net: dsa: vsc73xx: check busy flag in MDIO operations")
  2524d6c2 ("net: dsa: vsc73xx: use defined values in phy operations")
https://lore.kernel.org/20240813104039.429b9fe6@canb.auug.org.au
Resolve by using FIELD_PREP(), Stephen's resolution is simpler.

Adjacent changes:

net/vmw_vsock/af_vsock.c
  69139d29 ("vsock: fix recursive ->recvmsg calls")
  744500d8 ("vsock: add support for SIOCOUTQ ioctl")

Link: https://patch.msgid.link/20240815141149.33862-1-pabeni@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents a9c60712 a4a35f6c

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
		interrupt.

		This file switches between these two modes:
		- "mcu" makes the button press event be handled by the MCU to
		- ``mcu`` makes the button press event be handled by the MCU to
		change the LEDs panel intensity.
		- "cpu" makes the button press event be handled by the CPU.
		- ``cpu`` makes the button press event be handled by the CPU.

		Format: %s.

Documentation/admin-guide/cifs/usage.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
		may use NTLMSSP 0x00080
		must use NTLMSSP 0x80080
		seal (packet encryption) 0x00040
		must seal (not implemented yet) 0x40040
		must seal 0x40040

		cifsFYI If set to non-zero value, additional debug information
		will be logged to the system error log. This field

Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml

+6 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,12 @@ properties:
		oneOf:
		# Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel
		- const: samsung,atna33xc20
		# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
		- items:
		- const: samsung,atna45af01
		- enum:
		# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
		- samsung,atna45af01
		# Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel
		- samsung,atna45dc02
		- const: samsung,atna33xc20

		enable-gpios: true

Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@ properties:
		A reference to a node representing a PCS PHY device found on
		the internal MDIO bus.

		phys:
		description: A reference to the SerDes lane(s)
		maxItems: 1

		required:
		- reg

Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml

+2 −1

Original line number	Diff line number	Diff line
		@@ -199,10 +199,11 @@ additionalProperties: false

		examples:
		- \|
		#include <dt-bindings/gpio/gpio.h>
		codec@1,0{
		compatible = "slim217,250";
		reg = <1 0>;
		reset-gpios = <&tlmm 64 0>;
		reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;
		slim-ifc-dev = <&wcd9340_ifd>;
		#sound-dai-cells = <1>;
		interrupt-parent = <&tlmm>;