Commit 041c3466 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.

net/mac80211/key.c
  02e0e426 ("wifi: mac80211: fix error path key leak")
  2a8b665e ("wifi: mac80211: remove key_mtx")
  7d6904bf ("Merge wireless into wireless-next")
https://lore.kernel.org/all/20231012113648.46eea5ec@canb.auug.org.au/



Adjacent changes:

drivers/net/ethernet/ti/Kconfig
  a602ee31 ("net: ethernet: ti: Fix mixed module-builtin object")
  98bdeae9 ("net: cpmac: remove driver to prepare for platform removal")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f2cab25b ce55c22e

Documentation/ABI/testing/sysfs-class-firmware

+7 −7
Original line number Diff line number Diff line 
What: 		/sys/class/firmware/.../data

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The data sysfs file is used for firmware-fallback and for

		firmware uploads. Cat a firmware image to this sysfs file

		after you echo 1 to the loading sysfs file. When the firmware
@@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for 
What: 		/sys/class/firmware/.../cancel

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Write-only. For firmware uploads, write a "1" to this file to

		request that the transfer of firmware data to the lower-level

		device be canceled. This request will be rejected (EBUSY) if
@@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to 
What: 		/sys/class/firmware/.../error

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing a failed firmware

		upload. This string will be in the form of <STATUS>:<ERROR>,

		where <STATUS> will be one of the status strings described
@@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware 
What: 		/sys/class/firmware/.../loading

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The loading sysfs file is used for both firmware-fallback and

		for firmware uploads. Echo 1 onto the loading file to indicate

		you are writing a firmware file to the data sysfs node. Echo
@@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and 
What: 		/sys/class/firmware/.../remaining_size

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. For firmware upload, this file contains the size

		of the firmware data that remains to be transferred to the

		lower-level device driver. The size value is initialized to
@@ -62,7 +62,7 @@ Description: Read-only. For firmware upload, this file contains the size 
What: 		/sys/class/firmware/.../status

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing the current status of

		a firmware upload. The string will be one of the following:

		idle, "receiving", "preparing", "transferring", "programming".
@@ -70,7 +70,7 @@ Description: Read-only. Returns a string describing the current status of 
What: 		/sys/class/firmware/.../timeout

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	This file supports the timeout mechanism for firmware

		fallback.  This file has no affect on firmware uploads. For

		more information on timeouts please see the documentation

Documentation/core-api/workqueue.rst

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ unbound worker-pools and only one work item could be active at any given 
time thus achieving the same ordering property as ST wq.



In the current implementation the above configuration only guarantees

ST behavior within a given NUMA node. Instead ``alloc_ordered_queue()`` should

ST behavior within a given NUMA node. Instead ``alloc_ordered_workqueue()`` should

be used to achieve system-wide ST behavior.
@@ -390,7 +390,7 @@ The default affinity scope can be changed with the module parameter 
scope can be changed using ``apply_workqueue_attrs()``.



If ``WQ_SYSFS`` is set, the workqueue will have the following affinity scope

related interface files under its ``/sys/devices/virtual/WQ_NAME/``

related interface files under its ``/sys/devices/virtual/workqueue/WQ_NAME/``

directory.



``affinity_scope``

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ description: | 


maintainers:

  - Michael Tretter <m.tretter@pengutronix.de>

  - Harini Katakam <harini.katakam@amd.com>

  - Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>



allOf:

  - $ref: ../dma-controller.yaml#
@@ -65,6 +67,7 @@ required: 
  - interrupts

  - clocks

  - clock-names

  - xlnx,bus-width



additionalProperties: false

Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ patternProperties: 
    required:

      - reg



    additionalProperties: true

    additionalProperties: false



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#

Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml

+1 −0
Original line number Diff line number Diff line
@@ -45,5 +45,6 @@ examples: 
      light-sensor@38 {

        compatible = "rohm,bu27010";

        reg = <0x38>;

        vdd-supply = <&vdd>;

      };

    };