Skip to content

Commit ddb7a62

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.17/selftests' into for-linus
- upgrade the python scripts in hid-selftests to match hid-tools version 0.10 (Benjamin Tissoires)
2 parents 4859d6f + 1aee3a4 commit ddb7a62

File tree

484 files changed

+5587
-3485
lines changed

Some content is hidden

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

484 files changed

+5587
-3485
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ Dmitry Safonov <[email protected]> <[email protected]>
223223
224224
Domen Puncer <[email protected]>
225225
Douglas Gilbert <[email protected]>
226+
227+
226228
Ed L. Cashin <[email protected]>
227229
228230
Enric Balletbo i Serra <[email protected]> <[email protected]>
@@ -830,3 +832,6 @@ Yosry Ahmed <[email protected]> <[email protected]>
830832
Yusuke Goda <[email protected]>
831833
832834
835+
836+
837+

Documentation/ABI/testing/sysfs-devices-power

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Date: January 2009
5656
Contact: Rafael J. Wysocki <[email protected]>
5757
Description:
5858
The /sys/devices/.../async attribute allows the user space to
59-
enable or diasble the device's suspend and resume callbacks to
59+
enable or disable the device's suspend and resume callbacks to
6060
be executed asynchronously (ie. in separate threads, in parallel
6161
with the main suspend/resume thread) during system-wide power
6262
transitions (eg. suspend to RAM, hibernation).

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of
711711

712712
The file is read only.
713713

714-
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
714+
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
715715
Date: February 2018
716716
Contact: Stanislav Nijnikov <[email protected]>
717717
Description: This file shows the total physical memory resources. This is

Documentation/ABI/testing/sysfs-edac-scrub

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ Description:
4949
(RO) Supported minimum scrub cycle duration in seconds
5050
by the memory scrubber.
5151

52+
Device-based scrub: returns the minimum scrub cycle
53+
supported by the memory device.
54+
55+
Region-based scrub: returns the max of minimum scrub cycles
56+
supported by individual memory devices that back the region.
57+
5258
What: /sys/bus/edac/devices/<dev-name>/scrubX/max_cycle_duration
5359
Date: March 2025
5460
KernelVersion: 6.15
@@ -57,6 +63,16 @@ Description:
5763
(RO) Supported maximum scrub cycle duration in seconds
5864
by the memory scrubber.
5965

66+
Device-based scrub: returns the maximum scrub cycle supported
67+
by the memory device.
68+
69+
Region-based scrub: returns the min of maximum scrub cycles
70+
supported by individual memory devices that back the region.
71+
72+
If the memory device does not provide maximum scrub cycle
73+
information, return the maximum supported value of the scrub
74+
cycle field.
75+
6076
What: /sys/bus/edac/devices/<dev-name>/scrubX/current_cycle_duration
6177
Date: March 2025
6278
KernelVersion: 6.15

Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ properties:
2626
- const: realtek,rtl9301-i2c
2727

2828
reg:
29-
description: Register offset and size this I2C controller.
29+
items:
30+
- description: Register offset and size this I2C controller.
3031

3132
"#address-cells":
3233
const: 1

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
$id: http://devicetree.org/schemas/input/elan,ekth6915.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Elan eKTH6915 touchscreen controller
7+
title: Elan I2C-HID touchscreen controllers
88

99
maintainers:
1010
- Douglas Anderson <[email protected]>
1111

1212
description:
13-
Supports the Elan eKTH6915 touchscreen controller.
14-
This touchscreen controller uses the i2c-hid protocol with a reset GPIO.
13+
Supports the Elan eKTH6915 and other I2C-HID touchscreen controllers.
14+
These touchscreen controller use the i2c-hid protocol with a reset GPIO.
1515

1616
allOf:
1717
- $ref: /schemas/input/touchscreen/touchscreen.yaml#
@@ -23,12 +23,14 @@ properties:
2323
- enum:
2424
- elan,ekth5015m
2525
- const: elan,ekth6915
26+
- items:
27+
- const: elan,ekth8d18
28+
- const: elan,ekth6a12nay
2629
- enum:
2730
- elan,ekth6915
2831
- elan,ekth6a12nay
2932

30-
reg:
31-
const: 0x10
33+
reg: true
3234

3335
interrupts:
3436
maxItems: 1

Documentation/devicetree/bindings/net/sophgo,sg2044-dwmac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ examples:
8080
interrupt-parent = <&intc>;
8181
interrupts = <296 IRQ_TYPE_LEVEL_HIGH>;
8282
interrupt-names = "macirq";
83+
phy-handle = <&phy0>;
84+
phy-mode = "rgmii-id";
8385
resets = <&rst 30>;
8486
reset-names = "stmmaceth";
8587
snps,multicast-filter-bins = <0>;
@@ -91,7 +93,6 @@ examples:
9193
snps,mtl-rx-config = <&gmac0_mtl_rx_setup>;
9294
snps,mtl-tx-config = <&gmac0_mtl_tx_setup>;
9395
snps,axi-config = <&gmac0_stmmac_axi_setup>;
94-
status = "disabled";
9596
9697
gmac0_mtl_rx_setup: rx-queues-config {
9798
snps,rx-queues-to-use = <8>;

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ allOf:
4545
- ns16550
4646
- ns16550a
4747
then:
48-
anyOf:
48+
oneOf:
4949
- required: [ clock-frequency ]
5050
- required: [ clocks ]
5151

Documentation/networking/tls.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ User interface
1616
Creating a TLS connection
1717
-------------------------
1818

19-
First create a new TCP socket and set the TLS ULP.
19+
First create a new TCP socket and once the connection is established set the
20+
TLS ULP.
2021

2122
.. code-block:: c
2223
2324
sock = socket(AF_INET, SOCK_STREAM, 0);
25+
connect(sock, addr, addrlen);
2426
setsockopt(sock, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));
2527
2628
Setting the TLS ULP allows us to set/get TLS socket options. Currently

Documentation/process/maintainer-netdev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Posting as one thread is discouraged because it confuses patchwork
312312
(as of patchwork 2.2.2).
313313

314314
Co-posting selftests
315-
--------------------
315+
~~~~~~~~~~~~~~~~~~~~
316316

317317
Selftests should be part of the same series as the code changes.
318318
Specifically for fixes both code change and related test should go into

0 commit comments

Comments
 (0)