Skip to content

Commit 8b151cd

Browse files
committed
Merge branch 'sound/upstream-20250915' into merge/sound-upstream-20250915
2 parents 34b2c69 + d31e5e9 commit 8b151cd

1,445 files changed

Lines changed: 22468 additions & 18037 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ Domen Puncer <domen@coderock.org>
226226
Douglas Gilbert <dougg@torque.net>
227227
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
228228
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
229+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <easwar.hariharan@intel.com>
230+
Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <eahariha@linux.microsoft.com>
229231
Ed L. Cashin <ecashin@coraid.com>
230232
Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
231233
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -587,6 +589,7 @@ Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
587589
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
588590
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
589591
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
592+
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba> <nobuhiro1.iwamatsu@toshiba.co.jp>
590593
Odelu Kukatla <quic_okukatla@quicinc.com> <okukatla@codeaurora.org>
591594
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
592595
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

CREDITS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3222,6 +3222,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
32223222
D: Starter of Linux1394 effort
32233223
S: ask per mail for current address
32243224

3225+
N: Boris Pismenny
3226+
E: borisp@mellanox.com
3227+
D: Kernel TLS implementation and offload support.
3228+
32253229
N: Nicolas Pitre
32263230
E: nico@fluxnic.net
32273231
D: StrongARM SA1100 support integrator & hacker
@@ -4168,6 +4172,9 @@ S: 1513 Brewster Dr.
41684172
S: Carrollton, TX 75010
41694173
S: USA
41704174

4175+
N: Dave Watson
4176+
D: Kernel TLS implementation.
4177+
41714178
N: Tim Waugh
41724179
E: tim@cyberelk.net
41734180
D: Co-architect of the parallel-port sharing system

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ both cgroups.
435435
Controlling Controllers
436436
-----------------------
437437

438-
Availablity
439-
~~~~~~~~~~~
438+
Availability
439+
~~~~~~~~~~~~
440440

441441
A controller is available in a cgroup when it is supported by the kernel (i.e.,
442442
compiled in, not disabled and not attached to a v1 hierarchy) and listed in the

Documentation/admin-guide/hw-vuln/attack_vector_controls.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Spectre_v2 X X
215215
Spectre_v2_user X X * (Note 1)
216216
SRBDS X X X X
217217
SRSO X X X X
218-
SSB (Note 4)
218+
SSB X
219219
TAA X X X X * (Note 2)
220220
TSA X X X X
221221
=============== ============== ============ ============= ============== ============ ========
@@ -229,9 +229,6 @@ Notes:
229229
3 -- Disables SMT if cross-thread mitigations are fully enabled, the CPU is
230230
vulnerable, and STIBP is not supported
231231

232-
4 -- Speculative store bypass is always enabled by default (no kernel
233-
mitigation applied) unless overridden with spec_store_bypass_disable option
234-
235232
When an attack-vector is disabled, all mitigations for the vulnerabilities
236233
listed in the above table are disabled, unless mitigation is required for a
237234
different enabled attack-vector or a mitigation is explicitly selected via a

Documentation/core-api/symbol-namespaces.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,21 @@ unit as preprocessor statement. The above example would then read::
7676
within the corresponding compilation unit before the #include for
7777
<linux/export.h>. Typically it's placed before the first #include statement.
7878

79-
Using the EXPORT_SYMBOL_GPL_FOR_MODULES() macro
80-
-----------------------------------------------
79+
Using the EXPORT_SYMBOL_FOR_MODULES() macro
80+
-------------------------------------------
8181

8282
Symbols exported using this macro are put into a module namespace. This
83-
namespace cannot be imported.
83+
namespace cannot be imported. These exports are GPL-only as they are only
84+
intended for in-tree modules.
8485

8586
The macro takes a comma separated list of module names, allowing only those
8687
modules to access this symbol. Simple tail-globs are supported.
8788

8889
For example::
8990

90-
EXPORT_SYMBOL_GPL_FOR_MODULES(preempt_notifier_inc, "kvm,kvm-*")
91+
EXPORT_SYMBOL_FOR_MODULES(preempt_notifier_inc, "kvm,kvm-*")
9192

92-
will limit usage of this symbol to modules whoes name matches the given
93+
will limit usage of this symbol to modules whose name matches the given
9394
patterns.
9495

9596
How to use Symbols exported in Namespaces

Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt

Lines changed: 0 additions & 61 deletions
This file was deleted.

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
items:
2323
- enum:
2424
- qcom,qcm2290-cpufreq-hw
25+
- qcom,qcs615-cpufreq-hw
2526
- qcom,sc7180-cpufreq-hw
2627
- qcom,sc8180x-cpufreq-hw
2728
- qcom,sdm670-cpufreq-hw
@@ -132,6 +133,7 @@ allOf:
132133
compatible:
133134
contains:
134135
enum:
136+
- qcom,qcs615-cpufreq-hw
135137
- qcom,qdu1000-cpufreq-epss
136138
- qcom,sa8255p-cpufreq-epss
137139
- qcom,sa8775p-cpufreq-epss
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/cpufreq/mediatek,mt8196-cpufreq-hw.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek Hybrid CPUFreq for MT8196/MT6991 series SoCs
8+
9+
maintainers:
10+
- Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
11+
12+
description:
13+
MT8196 uses CPUFreq management hardware that supports dynamic voltage
14+
frequency scaling (dvfs), and can support several performance domains.
15+
16+
properties:
17+
compatible:
18+
const: mediatek,mt8196-cpufreq-hw
19+
20+
reg:
21+
items:
22+
- description: FDVFS control register region
23+
- description: OPP tables and control for performance domain 0
24+
- description: OPP tables and control for performance domain 1
25+
- description: OPP tables and control for performance domain 2
26+
27+
"#performance-domain-cells":
28+
const: 1
29+
30+
required:
31+
- compatible
32+
- reg
33+
- "#performance-domain-cells"
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
cpus {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
cpu0: cpu@0 {
44+
device_type = "cpu";
45+
compatible = "arm,cortex-a720";
46+
enable-method = "psci";
47+
performance-domains = <&performance 0>;
48+
reg = <0x000>;
49+
};
50+
51+
/* ... */
52+
53+
cpu6: cpu@600 {
54+
device_type = "cpu";
55+
compatible = "arm,cortex-x4";
56+
enable-method = "psci";
57+
performance-domains = <&performance 1>;
58+
reg = <0x600>;
59+
};
60+
61+
cpu7: cpu@700 {
62+
device_type = "cpu";
63+
compatible = "arm,cortex-x925";
64+
enable-method = "psci";
65+
performance-domains = <&performance 2>;
66+
reg = <0x700>;
67+
};
68+
};
69+
70+
/* ... */
71+
72+
soc {
73+
#address-cells = <2>;
74+
#size-cells = <2>;
75+
76+
performance: performance-controller@c2c2034 {
77+
compatible = "mediatek,mt8196-cpufreq-hw";
78+
reg = <0 0xc220400 0 0x20>, <0 0xc2c0f20 0 0x120>,
79+
<0 0xc2c1040 0 0x120>, <0 0xc2c1160 0 0x120>;
80+
#performance-domain-cells = <1>;
81+
};
82+
};

Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ properties:
6060
- const: bus
6161
- const: core
6262
- const: vsync
63-
- const: lut
6463
- const: tbu
6564
- const: tbu_rt
6665
# MSM8996 has additional iommu clock

Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Infineon Buck Regulators with PMBUS interfaces
88

99
maintainers:
10-
- Not Me.
10+
- Guenter Roeck <linux@roeck-us.net>
1111

1212
allOf:
1313
- $ref: regulator.yaml#

0 commit comments

Comments
 (0)