Merge branch 'master' into mm-hotfixes-stable

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

@@ -1,4 +1,4 @@
-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: [email protected]
@@ -8,31 +8,31 @@ 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: [email protected]
 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: [email protected]
 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: [email protected]
 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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]
@@ -62,15 +62,15 @@ 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: [email protected]
 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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]

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

@@ -1,12 +1,12 @@
-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: [email protected]
 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: [email protected]
@@ -20,15 +20,15 @@ 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: [email protected]
 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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]

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

@@ -1,4 +1,4 @@
-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: [email protected]
@@ -12,15 +12,15 @@ 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: [email protected]
 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: [email protected]
@@ -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: [email protected]
@@ -44,23 +44,23 @@ 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: [email protected]
 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: [email protected]
 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: [email protected]

Documentation/dev-tools/kunit/usage.rst

@@ -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

@@ -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/netlink/specs/rt_link.yaml

@@ -942,6 +942,10 @@ attribute-sets:
  -
  name: gro-ipv4-max-size
  type: u32
+ -
+ name: dpll-pin
+ type: nest
+ nested-attributes: link-dpll-pin-attrs
  -
  name: af-spec-attrs
  attributes:
@@ -1627,6 +1631,12 @@ attribute-sets:
  -
  name: used
  type: u8
+ -
+ name: link-dpll-pin-attrs
+ attributes:
+ -
+ name: id
+ type: u32
 
 sub-messages:
  -

Documentation/usb/gadget-testing.rst

@@ -448,17 +448,17 @@ 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
- host_addr  MAC address of host's end of this
-  Ethernet over USB link
- 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)
- ===============  ==================================================
+ ======================= ==================================================
+ ifname  network device interface name associated with this
+  function instance
+ qmult  queue length multiplier for high and super speed
+ host_addr  MAC address of host's end of this
+  Ethernet over USB link
+ 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 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

@@ -10091,7 +10091,7 @@ L: [email protected]
 S: Maintained
 W: https://i2c.wiki.kernel.org/
 Q: https://patchwork.ozlabs.org/project/linux-i2c/list/
-T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
+T: git git:https://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/
@@ -10283,7 +10283,7 @@ F: drivers/scsi/ibmvscsi/ibmvscsi*
 F: include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M: Michael Cyr <mikecyr@linux.ibm.com>
+M: Tyrel Datwyler <tyreld@linux.ibm.com>
 L: [email protected]
 L: [email protected]
 S: Supported
@@ -11725,6 +11725,7 @@ F: fs/smb/server/
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M: Brendan Higgins <[email protected]>
 M: David Gow <[email protected]>
+R: Rae Moar <[email protected]>
 L: [email protected]
 L: [email protected]
 S: Maintained
@@ -15180,13 +15181,15 @@ F: Documentation/networking/net_cachelines/net_device.rst
 F: drivers/connector/
 F: drivers/net/
 F: include/dt-bindings/net/
+F: include/linux/cn_proc.h
 F: include/linux/etherdevice.h
 F: include/linux/fcdevice.h
 F: include/linux/fddidevice.h
 F: include/linux/hippidevice.h
 F: include/linux/if_*
 F: include/linux/inetdevice.h
 F: include/linux/netdevice.h
+F: include/uapi/linux/cn_proc.h
 F: include/uapi/linux/if_*
 F: include/uapi/linux/netdevice.h
 X: drivers/net/wireless/
@@ -16859,9 +16862,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 <[email protected]>
-R: Manivannan Sadhasivam <[email protected]>
 R: Kishon Vijay Abraham I <[email protected]>
 L: [email protected]
 S: Supported
@@ -18084,7 +18086,6 @@ F: drivers/net/ethernet/qualcomm/emac/
 
 QUALCOMM ETHQOS ETHERNET DRIVER
 M: Vinod Koul <[email protected]>
-R: Bhupesh Sharma <[email protected]>
 L: [email protected]
 L: [email protected]
 S: Maintained