Skip to content

Commit d3cb884

Browse files
authored
Merge pull request #5485 from bardliao/merge/sound-upstream-20250708
Merge/sound upstream 20250708
2 parents cf1d917 + 40ca213 commit d3cb884

File tree

736 files changed

+8882
-5243
lines changed

Some content is hidden

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

736 files changed

+8882
-5243
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+

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,11 @@ S: 521 Pleasant Valley Road
29812981
S: Potsdam, New York 13676
29822982
S: USA
29832983

2984+
N: Shannon Nelson
2985+
2986+
D: Worked on several network drivers including
2987+
D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl
2988+
29842989
N: Dave Neuer
29852990
29862991
D: Helped implement support for Compaq's H31xx series iPAQs

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/bpf/map_hash.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,16 @@ attempts in order to enforce the LRU property which have increasing impacts on
233233
other CPUs involved in the following operation attempts:
234234

235235
- Attempt to use CPU-local state to batch operations
236-
- Attempt to fetch free nodes from global lists
236+
- Attempt to fetch ``target_free`` free nodes from global lists
237237
- Attempt to pull any node from a global list and remove it from the hashmap
238238
- Attempt to pull any node from any CPU's list and remove it from the hashmap
239239

240+
The number of nodes to borrow from the global list in a batch, ``target_free``,
241+
depends on the size of the map. Larger batch size reduces lock contention, but
242+
may also exhaust the global structure. The value is computed at map init to
243+
avoid exhaustion, by limiting aggregate reservation by all CPUs to half the map
244+
size. With a minimum of a single element and maximum budget of 128 at a time.
245+
240246
This algorithm is described visually in the following diagram. See the
241247
description in commit 3a08c2fd7634 ("bpf: LRU List") for a full explanation of
242248
the corresponding operations:

Documentation/bpf/map_lru_hash_update.dot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ digraph {
3535
fn_bpf_lru_list_pop_free_to_local [shape=rectangle,fillcolor=2,
3636
label="Flush local pending,
3737
Rotate Global list, move
38-
LOCAL_FREE_TARGET
38+
target_free
3939
from global -> local"]
4040
// Also corresponds to:
4141
// fn__local_list_flush()
4242
// fn_bpf_lru_list_rotate()
4343
fn___bpf_lru_node_move_to_free[shape=diamond,fillcolor=2,
44-
label="Able to free\nLOCAL_FREE_TARGET\nnodes?"]
44+
label="Able to free\ntarget_free\nnodes?"]
4545

4646
fn___bpf_lru_list_shrink_inactive [shape=rectangle,fillcolor=3,
4747
label="Shrink inactive list
4848
up to remaining
49-
LOCAL_FREE_TARGET
49+
target_free
5050
(global LRU -> local)"]
5151
fn___bpf_lru_list_shrink [shape=diamond,fillcolor=2,
5252
label="> 0 entries in\nlocal free list?"]

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,11 @@ $defs:
118118
ti,lvds-vod-swing-clock-microvolt:
119119
description: LVDS diferential output voltage <min max> for clock
120120
lanes in microvolts.
121-
$ref: /schemas/types.yaml#/definitions/uint32-array
122-
minItems: 2
123121
maxItems: 2
124122

125123
ti,lvds-vod-swing-data-microvolt:
126124
description: LVDS diferential output voltage <min max> for data
127125
lanes in microvolts.
128-
$ref: /schemas/types.yaml#/definitions/uint32-array
129-
minItems: 2
130126
maxItems: 2
131127

132128
allOf:

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

0 commit comments

Comments
 (0)