Commit c8bdef15 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'master' into mm-hotfixes-stable

parents 349bd87f 54be6c6c

Documentation/ABI/testing/sysfs-class-net-queues

+11 −11
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/queues/rx-<queue>/rps_cpus

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_cpus

Date:		March 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -8,7 +8,7 @@ Description: 
		network device queue. Possible values depend on the number

		of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt

Date:		April 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -16,7 +16,7 @@ Description: 
		Number of Receive Packet Steering flows being currently

		processed by this particular network device receive queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_timeout

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_timeout

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -24,7 +24,7 @@ Description: 
		Indicates the number of transmit timeout events seen by this

		network interface transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_maxrate

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate

Date:		March 2015

KernelVersion:	4.1

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		A Mbps max-rate set for the queue, a value of zero means disabled,

		default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_cpus

Date:		November 2010

KernelVersion:	2.6.38

Contact:	netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description: 
		network device transmit queue. Possible values depend on the

		number of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_rxqs

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs

Date:		June 2018

KernelVersion:	4.18.0

Contact:	netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description: 
		number of available receive queue(s) in the network device.

		Default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -62,7 +62,7 @@ Description: 
		of this particular network device transmit queue.

		Default value is 1000.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -70,7 +70,7 @@ Description: 
		Indicates the number of bytes (objects) in flight on this

		network device transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description: 
		on this network device transmit queue. This value is clamped

		to be within the bounds defined by limit_max and limit_min.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description: 
		queued on this network device transmit queue. See

		include/linux/dynamic_queue_limits.h for the default value.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org

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/dev-tools/kunit/usage.rst

+17 −2
Original line number Diff line number Diff line
@@ -671,8 +671,23 @@ Testing Static Functions 
------------------------



If we do not want to expose functions or variables for testing, one option is to

conditionally ``#include`` the test file at the end of your .c file. For

example:

conditionally export the used symbol. For example:



.. code-block:: c



	/* In my_file.c */



	VISIBLE_IF_KUNIT int do_interesting_thing();

	EXPORT_SYMBOL_IF_KUNIT(do_interesting_thing);



	/* In my_file.h */



	#if IS_ENABLED(CONFIG_KUNIT)

		int do_interesting_thing(void);

	#endif



Alternatively, you could conditionally ``#include`` the test file at the end of

your .c file. For example:



.. code-block:: c

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: