Skip to content

Commit c8bdef1

Browse files
akpm00akpm00
committed
Merge branch 'master' into mm-hotfixes-stable
2 parents 349bd87 + 54be6c6 commit c8bdef1

File tree

426 files changed

+5071
-3352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+5071
-3352
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/class/<iface>/queues/rx-<queue>/rps_cpus
1+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_cpus
22
Date: March 2010
33
KernelVersion: 2.6.35
44
Contact: netdev@vger.kernel.org
@@ -8,31 +8,31 @@ Description:
88
network device queue. Possible values depend on the number
99
of available CPU(s) in the system.
1010

11-
What: /sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt
11+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt
1212
Date: April 2010
1313
KernelVersion: 2.6.35
1414
Contact: netdev@vger.kernel.org
1515
Description:
1616
Number of Receive Packet Steering flows being currently
1717
processed by this particular network device receive queue.
1818

19-
What: /sys/class/<iface>/queues/tx-<queue>/tx_timeout
19+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_timeout
2020
Date: November 2011
2121
KernelVersion: 3.3
2222
Contact: netdev@vger.kernel.org
2323
Description:
2424
Indicates the number of transmit timeout events seen by this
2525
network interface transmit queue.
2626

27-
What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate
27+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate
2828
Date: March 2015
2929
KernelVersion: 4.1
3030
Contact: netdev@vger.kernel.org
3131
Description:
3232
A Mbps max-rate set for the queue, a value of zero means disabled,
3333
default is disabled.
3434

35-
What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
35+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_cpus
3636
Date: November 2010
3737
KernelVersion: 2.6.38
3838
Contact: netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description:
4242
network device transmit queue. Possible values depend on the
4343
number of available CPU(s) in the system.
4444

45-
What: /sys/class/<iface>/queues/tx-<queue>/xps_rxqs
45+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs
4646
Date: June 2018
4747
KernelVersion: 4.18.0
4848
Contact: netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description:
5353
number of available receive queue(s) in the network device.
5454
Default is disabled.
5555

56-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
56+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
5757
Date: November 2011
5858
KernelVersion: 3.3
5959
Contact: netdev@vger.kernel.org
@@ -62,15 +62,15 @@ Description:
6262
of this particular network device transmit queue.
6363
Default value is 1000.
6464

65-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
65+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
6666
Date: November 2011
6767
KernelVersion: 3.3
6868
Contact: netdev@vger.kernel.org
6969
Description:
7070
Indicates the number of bytes (objects) in flight on this
7171
network device transmit queue.
7272

73-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit
73+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit
7474
Date: November 2011
7575
KernelVersion: 3.3
7676
Contact: netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description:
7979
on this network device transmit queue. This value is clamped
8080
to be within the bounds defined by limit_max and limit_min.
8181

82-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
82+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
8383
Date: November 2011
8484
KernelVersion: 3.3
8585
Contact: netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description:
8888
queued on this network device transmit queue. See
8989
include/linux/dynamic_queue_limits.h for the default value.
9090

91-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
91+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
9292
Date: November 2011
9393
KernelVersion: 3.3
9494
Contact: netdev@vger.kernel.org

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
1+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
22
Date: February 2023
33
KernelVersion: 6.2
44
Contact: intel-gfx@lists.freedesktop.org
55
Description: RO. Current Voltage in millivolt.
66

77
Only supported for particular Intel i915 graphics platforms.
88

9-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
9+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max
1010
Date: February 2023
1111
KernelVersion: 6.2
1212
Contact: intel-gfx@lists.freedesktop.org
@@ -20,15 +20,15 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts.
2020

2121
Only supported for particular Intel i915 graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
23+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max
2424
Date: February 2023
2525
KernelVersion: 6.2
2626
Contact: intel-gfx@lists.freedesktop.org
2727
Description: RO. Card default power limit (default TDP setting).
2828

2929
Only supported for particular Intel i915 graphics platforms.
3030

31-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
31+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval
3232
Date: February 2023
3333
KernelVersion: 6.2
3434
Contact: intel-gfx@lists.freedesktop.org
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in
3737

3838
Only supported for particular Intel i915 graphics platforms.
3939

40-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
40+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit
4141
Date: February 2023
4242
KernelVersion: 6.2
4343
Contact: intel-gfx@lists.freedesktop.org
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
5050

5151
Only supported for particular Intel i915 graphics platforms.
5252

53-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
53+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit
5454
Date: February 2023
5555
KernelVersion: 6.2
5656
Contact: intel-gfx@lists.freedesktop.org
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
6363

6464
Only supported for particular Intel i915 graphics platforms.
6565

66-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
66+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input
6767
Date: February 2023
6868
KernelVersion: 6.2
6969
Contact: intel-gfx@lists.freedesktop.org

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
1+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max
22
Date: September 2023
33
KernelVersion: 6.5
44
Contact: intel-xe@lists.freedesktop.org
@@ -12,15 +12,15 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts.
1212

1313
Only supported for particular Intel xe graphics platforms.
1414

15-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
15+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max
1616
Date: September 2023
1717
KernelVersion: 6.5
1818
Contact: intel-xe@lists.freedesktop.org
1919
Description: RO. Card default power limit (default TDP setting).
2020

2121
Only supported for particular Intel xe graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
23+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
2424
Date: September 2023
2525
KernelVersion: 6.5
2626
Contact: intel-xe@lists.freedesktop.org
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
3333

3434
Only supported for particular Intel xe graphics platforms.
3535

36-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
36+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
3737
Date: September 2023
3838
KernelVersion: 6.5
3939
Contact: intel-xe@lists.freedesktop.org
@@ -44,23 +44,23 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
4444
the operating frequency if the power averaged over a window
4545
exceeds this limit.
4646

47-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
47+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input
4848
Date: September 2023
4949
KernelVersion: 6.5
5050
Contact: intel-xe@lists.freedesktop.org
5151
Description: RO. Current Voltage in millivolt.
5252

5353
Only supported for particular Intel xe graphics platforms.
5454

55-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
55+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
5656
Date: September 2023
5757
KernelVersion: 6.5
5858
Contact: intel-xe@lists.freedesktop.org
5959
Description: RO. Energy input of device in microjoules.
6060

6161
Only supported for particular Intel xe graphics platforms.
6262

63-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
63+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
6464
Date: October 2023
6565
KernelVersion: 6.6
6666
Contact: intel-xe@lists.freedesktop.org

‎Documentation/dev-tools/kunit/usage.rst

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,23 @@ Testing Static Functions
671671
------------------------
672672

673673
If we do not want to expose functions or variables for testing, one option is to
674-
conditionally ``#include`` the test file at the end of your .c file. For
675-
example:
674+
conditionally export the used symbol. For example:
675+
676+
.. code-block:: c
677+
678+
/* In my_file.c */
679+
680+
VISIBLE_IF_KUNIT int do_interesting_thing();
681+
EXPORT_SYMBOL_IF_KUNIT(do_interesting_thing);
682+
683+
/* In my_file.h */
684+
685+
#if IS_ENABLED(CONFIG_KUNIT)
686+
int do_interesting_thing(void);
687+
#endif
688+
689+
Alternatively, you could conditionally ``#include`` the test file at the end of
690+
your .c file. For example:
676691

677692
.. code-block:: c
678693

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- const: allwinner,sun6i-a31-spdif
2323
- const: allwinner,sun8i-h3-spdif
2424
- const: allwinner,sun50i-h6-spdif
25+
- const: allwinner,sun50i-h616-spdif
2526
- items:
2627
- const: allwinner,sun8i-a83t-spdif
2728
- const: allwinner,sun8i-h3-spdif
@@ -62,6 +63,8 @@ allOf:
6263
enum:
6364
- allwinner,sun6i-a31-spdif
6465
- allwinner,sun8i-h3-spdif
66+
- allwinner,sun50i-h6-spdif
67+
- allwinner,sun50i-h616-spdif
6568

6669
then:
6770
required:
@@ -73,7 +76,7 @@ allOf:
7376
contains:
7477
enum:
7578
- allwinner,sun8i-h3-spdif
76-
- allwinner,sun50i-h6-spdif
79+
- allwinner,sun50i-h616-spdif
7780

7881
then:
7982
properties:

‎Documentation/netlink/specs/rt_link.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,10 @@ attribute-sets:
942942
-
943943
name: gro-ipv4-max-size
944944
type: u32
945+
-
946+
name: dpll-pin
947+
type: nest
948+
nested-attributes: link-dpll-pin-attrs
945949
-
946950
name: af-spec-attrs
947951
attributes:
@@ -1627,6 +1631,12 @@ attribute-sets:
16271631
-
16281632
name: used
16291633
type: u8
1634+
-
1635+
name: link-dpll-pin-attrs
1636+
attributes:
1637+
-
1638+
name: id
1639+
type: u32
16301640

16311641
sub-messages:
16321642
-

‎Documentation/usb/gadget-testing.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -448,17 +448,17 @@ Function-specific configfs interface
448448
The function name to use when creating the function directory is "ncm".
449449
The NCM function provides these attributes in its function directory:
450450

451-
=============== ==================================================
452-
ifname network device interface name associated with this
453-
function instance
454-
qmult queue length multiplier for high and super speed
455-
host_addr MAC address of host's end of this
456-
Ethernet over USB link
457-
dev_addr MAC address of device's end of this
458-
Ethernet over USB link
459-
max_segment_size Segment size required for P2P connections. This
460-
will set MTU to (max_segment_size - 14 bytes)
461-
=============== ==================================================
451+
======================= ==================================================
452+
ifname network device interface name associated with this
453+
function instance
454+
qmult queue length multiplier for high and super speed
455+
host_addr MAC address of host's end of this
456+
Ethernet over USB link
457+
dev_addr MAC address of device's end of this
458+
Ethernet over USB link
459+
max_segment_size Segment size required for P2P connections. This
460+
will set MTU to 14 bytes
461+
======================= ==================================================
462462

463463
and after creating the functions/ncm.<instance name> they contain default
464464
values: qmult is 5, dev_addr and host_addr are randomly selected.

‎MAINTAINERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10091,7 +10091,7 @@ L: linux-i2c@vger.kernel.org
1009110091
S: Maintained
1009210092
W: https://i2c.wiki.kernel.org/
1009310093
Q: https://patchwork.ozlabs.org/project/linux-i2c/list/
10094-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
10094+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
1009510095
F: Documentation/devicetree/bindings/i2c/
1009610096
F: drivers/i2c/algos/
1009710097
F: drivers/i2c/busses/
@@ -10283,7 +10283,7 @@ F: drivers/scsi/ibmvscsi/ibmvscsi*
1028310283
F: include/scsi/viosrp.h
1028410284

1028510285
IBM Power Virtual SCSI Device Target Driver
10286-
M: Michael Cyr <mikecyr@linux.ibm.com>
10286+
M: Tyrel Datwyler <tyreld@linux.ibm.com>
1028710287
L: linux-scsi@vger.kernel.org
1028810288
L: target-devel@vger.kernel.org
1028910289
S: Supported
@@ -11725,6 +11725,7 @@ F: fs/smb/server/
1172511725
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1172611726
M: Brendan Higgins <brendanhiggins@google.com>
1172711727
M: David Gow <davidgow@google.com>
11728+
R: Rae Moar <rmoar@google.com>
1172811729
L: linux-kselftest@vger.kernel.org
1172911730
L: kunit-dev@googlegroups.com
1173011731
S: Maintained
@@ -15180,13 +15181,15 @@ F: Documentation/networking/net_cachelines/net_device.rst
1518015181
F: drivers/connector/
1518115182
F: drivers/net/
1518215183
F: include/dt-bindings/net/
15184+
F: include/linux/cn_proc.h
1518315185
F: include/linux/etherdevice.h
1518415186
F: include/linux/fcdevice.h
1518515187
F: include/linux/fddidevice.h
1518615188
F: include/linux/hippidevice.h
1518715189
F: include/linux/if_*
1518815190
F: include/linux/inetdevice.h
1518915191
F: include/linux/netdevice.h
15192+
F: include/uapi/linux/cn_proc.h
1519015193
F: include/uapi/linux/if_*
1519115194
F: include/uapi/linux/netdevice.h
1519215195
X: drivers/net/wireless/
@@ -16859,9 +16862,8 @@ F: Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
1685916862
F: drivers/pci/controller/pcie-xilinx-cpm.c
1686016863

1686116864
PCI ENDPOINT SUBSYSTEM
16862-
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
16865+
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1686316866
M: Krzysztof Wilczyński <kw@linux.com>
16864-
R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1686516867
R: Kishon Vijay Abraham I <kishon@kernel.org>
1686616868
L: linux-pci@vger.kernel.org
1686716869
S: Supported
@@ -18084,7 +18086,6 @@ F: drivers/net/ethernet/qualcomm/emac/
1808418086

1808518087
QUALCOMM ETHQOS ETHERNET DRIVER
1808618088
M: Vinod Koul <vkoul@kernel.org>
18087-
R: Bhupesh Sharma <bhupesh.sharma@linaro.org>
1808818089
L: netdev@vger.kernel.org
1808918090
L: linux-arm-msm@vger.kernel.org
1809018091
S: Maintained

0 commit comments

Comments
 (0)