Commit 3be042cf 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.

No conflicts.

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/common.h
  38cc3c6d ("net: stmmac: protect updates of 64-bit statistics counters")
  fd5a6a71 ("net: stmmac: est: Per Tx-queue error count for HLBF")
  c5c3e1bf ("net: stmmac: Offload queueMaxSDU from tc-taprio")

drivers/net/wireless/microchip/wilc1000/netdev.c
  c9013880 ("wifi: fill in MODULE_DESCRIPTION()s for wilc1000")
  328efda2 ("wifi: wilc1000: do not realloc workqueue everytime an interface is added")

net/unix/garbage.c
  11498715 ("af_unix: Remove io_uring code for GC.")
  1279f9d9 ("af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b6b61455 1f719a2f

Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

+7 −7
Original line number Diff line number Diff line 
What:		/sys/devices/.../hwmon/hwmon<i>/in0_input

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -6,7 +6,7 @@ Description: RO. Current Voltage in millivolt. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_rated_max

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -28,7 +28,7 @@ Description: RO. Card default power limit (default TDP setting). 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max_interval

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_crit

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/curr1_crit

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/energy1_input

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+7 −7
Original line number Diff line number Diff line 
What:		/sys/devices/.../hwmon/hwmon<i>/power1_max

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -12,7 +12,7 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_rated_max

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RO. Card default power limit (default TDP setting). 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_crit

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/curr1_crit

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -44,7 +44,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes. 
		the operating frequency if the power averaged over a window

		exceeds this limit.



What:		/sys/devices/.../hwmon/hwmon<i>/in0_input

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -52,7 +52,7 @@ Description: RO. Current Voltage in millivolt. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/energy1_input

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -60,7 +60,7 @@ Description: RO. Energy input of device in microjoules. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max_interval

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval

Date:		October 2023

KernelVersion:	6.6

Contact:	intel-xe@lists.freedesktop.org

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
      - const: allwinner,sun6i-a31-spdif

      - const: allwinner,sun8i-h3-spdif

      - const: allwinner,sun50i-h6-spdif

      - const: allwinner,sun50i-h616-spdif

      - items:

          - const: allwinner,sun8i-a83t-spdif

          - const: allwinner,sun8i-h3-spdif
@@ -62,6 +63,8 @@ allOf: 
            enum:

              - allwinner,sun6i-a31-spdif

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      required:
@@ -73,7 +76,7 @@ allOf: 
          contains:

            enum:

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      properties:

Documentation/usb/gadget-testing.rst

+11 −11
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ Function-specific configfs interface 
The function name to use when creating the function directory is "ncm".

The NCM function provides these attributes in its function directory:



	===============   ==================================================

	======================= ==================================================

	ifname			network device interface name associated with this

				function instance

	qmult			queue length multiplier for high and super speed
@@ -457,8 +457,8 @@ The NCM function provides these attributes in its function directory: 
	dev_addr		MAC address of device's end of this

				Ethernet over USB link

	max_segment_size	Segment size required for P2P connections. This

			  will set MTU to (max_segment_size - 14 bytes)

	===============   ==================================================

				will set MTU to 14 bytes

	======================= ==================================================



and after creating the functions/ncm.<instance name> they contain default

values: qmult is 5, dev_addr and host_addr are randomly selected.

MAINTAINERS

+7 −9
Original line number Diff line number Diff line
@@ -4172,14 +4172,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c 
F:	drivers/net/ethernet/broadcom/bnxt/

F:	include/linux/firmware/broadcom/tee_bnxt_fw.h









BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER









M:	Arend van Spriel <aspriel@gmail.com>









M:	Franky Lin <franky.lin@broadcom.com>









M:	Hante Meuleman <hante.meuleman@broadcom.com>









BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS









M:	Arend van Spriel <arend.vanspriel@broadcom.com>









L:	linux-wireless@vger.kernel.org









L:	brcm80211@lists.linux.dev









L:	brcm80211-dev-list.pdl@broadcom.com









S:	Supported









F:	drivers/net/wireless/broadcom/brcm80211/









F:	include/linux/platform_data/brcmfmac.h

















BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>








@@ -10094,7 +10094,7 @@ L:	linux-i2c@vger.kernel.org







S:	Maintained









W:	https://i2c.wiki.kernel.org/









Q:	https://patchwork.ozlabs.org/project/linux-i2c/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git









F:	Documentation/devicetree/bindings/i2c/









F:	drivers/i2c/algos/









F:	drivers/i2c/busses/








@@ -11130,7 +11130,6 @@ S:	Supported







F:	drivers/net/wireless/intel/iwlegacy/

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Gregory Greenman <gregory.greenman@intel.com>









M:	Miri Korenblit <miriam.rachel.korenblit@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported








@@ -16866,9 +16865,8 @@ F:	Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml







F:	drivers/pci/controller/pcie-xilinx-cpm.c

















PCI ENDPOINT SUBSYSTEM









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









M:	Krzysztof Wilczyński <kw@linux.com>









R:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









R:	Kishon Vijay Abraham I <kishon@kernel.org>









L:	linux-pci@vger.kernel.org









S:	Supported








@@ -18444,7 +18442,7 @@ S:	Supported







F:	drivers/infiniband/sw/rdmavt

















RDS - RELIABLE DATAGRAM SOCKETS









M:	Santosh Shilimkar <santosh.shilimkar@oracle.com>









M:	Allison Henderson <allison.henderson@oracle.com>









L:	netdev@vger.kernel.org









L:	linux-rdma@vger.kernel.org









L:	rds-devel@oss.oracle.com (moderated for non-subscribers)