Skip to content

Commit

Permalink
Merge tag 'v6.9-rc3' into merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Apr 15, 2024
2 parents 5a53fad + fec50db commit 77dff0c
Show file tree
Hide file tree
Showing 449 changed files with 7,084 additions and 2,966 deletions.
5 changes: 5 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Adam Oldham <[email protected]>
Adam Radford <[email protected]>
Adriana Reus <[email protected]> <[email protected]>
Adrian Bunk <[email protected]>
Ajay Kaher <[email protected]> <[email protected]>
Akhil P Oommen <[email protected]> <[email protected]>
Alan Cox <[email protected]>
Alan Cox <[email protected]>
Expand All @@ -36,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexey Makhalov <[email protected]> <[email protected]>
Alex Hung <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Expand Down Expand Up @@ -110,6 +112,7 @@ Brendan Higgins <[email protected]> <[email protected]>
Brian Avery <[email protected]>
Brian King <[email protected]>
Brian Silverman <[email protected]> <[email protected]>
Bryan Tan <[email protected]> <[email protected]>
Cai Huoqing <[email protected]> <[email protected]>
Can Guo <[email protected]> <[email protected]>
Carl Huang <[email protected]> <[email protected]>
Expand Down Expand Up @@ -529,6 +532,7 @@ Rocky Liao <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Ronak Doshi <[email protected]> <[email protected]>
Muchun Song <[email protected]> <[email protected]>
Muchun Song <[email protected]> <[email protected]>
Ross Zwisler <[email protected]> <[email protected]>
Expand Down Expand Up @@ -651,6 +655,7 @@ Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Vishnu Dasa <[email protected]> <[email protected]>
Vivek Aknurwar <[email protected]> <[email protected]>
Vivien Didelot <[email protected]> <[email protected]>
Vlad Dogaru <[email protected]> <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6599,7 +6599,7 @@
To turn off having tracepoints sent to printk,
echo 0 > /proc/sys/kernel/tracepoint_printk
Note, echoing 1 into this file without the
tracepoint_printk kernel cmdline option has no effect.
tp_printk kernel cmdline option has no effect.

The tp_printk_stop_on_boot (see below) can also be used
to stop the printing of events to console at
Expand Down
4 changes: 2 additions & 2 deletions Documentation/admin-guide/mm/zswap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis.

Some users cannot tolerate the swapping that comes with zswap store failures
and zswap writebacks. Swapping can be disabled entirely (without disabling
zswap itself) on a cgroup-basis as follows:
zswap itself) on a cgroup-basis as follows::

echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback

Expand All @@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again).
When there is a sizable amount of cold memory residing in the zswap pool, it
can be advantageous to proactively write these cold pages to swap and reclaim
the memory for other use cases. By default, the zswap shrinker is disabled.
User can enable it as follows:
User can enable it as follows::

echo Y > /sys/module/zswap/parameters/shrinker_enabled

Expand Down
2 changes: 2 additions & 0 deletions Documentation/dev-tools/testing-overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ Some of these tools are listed below:
KASAN and can be used in production. See Documentation/dev-tools/kfence.rst
* lockdep is a locking correctness validator. See
Documentation/locking/lockdep-design.rst
* Runtime Verification (RV) supports checking specific behaviours for a given
subsystem. See Documentation/trace/rv/runtime-verification.rst
* There are several other pieces of debug instrumentation in the kernel, many
of which can be found in lib/Kconfig.debug

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/keystone-gate.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Status: Unstable - ABI compatibility may be broken in the future

Binding for Keystone gate control driver which uses PSC controller IP.

This binding uses the common clock binding[1].
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/keystone-pll.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Status: Unstable - ABI compatibility may be broken in the future

Binding for keystone PLLs. The main PLL IP typically has a multiplier,
a divider and a post divider. The additional PLL IPs like ARMPLL, DDRPLL
and PAPLL are controlled by the memory mapped register where as the Main
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/adpll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments ADPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped ADPLL with two to three selectable input clocks
and three to four children.
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/apll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments APLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped APLL with usually two selectable input clocks
(reference clock and bypass clock), with analog phase locked
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/autoidle.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments autoidle clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a register mapped
clock which can be put to idle automatically by hardware based on the usage
and a configuration bit setting. Autoidle clock is never an individual
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/clockdomain.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments clockdomain.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1] in consumer role.
Every clock on TI SoC belongs to one clockdomain, but software
only needs this information for specific clocks which require
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/composite.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI composite clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped composite clock with multiple different sub-types;

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/divider.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI divider clock

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped adjustable clock rate divider that does not gate and has
only one input clock or parent. By default the value programmed into
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/dpll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments DPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped DPLL with usually two selectable input clocks
(reference clock and bypass clock), with digital phase locked
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/fapll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments FAPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped FAPLL with usually two selectable input clocks
(reference clock and bypass clock), and one or more child
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI fixed factor rate clock sources.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1], and also uses the autoidle
support from TI autoidle clock [2].

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/gate.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments gate clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. This clock is
quite much similar to the basic gate-clock [2], however,
it supports a number of additional features. If no register
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/interface.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments interface clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. This clock is
quite much similar to the basic gate-clock [2], however,
it supports a number of additional features, including
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/mux.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI mux clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped multiplexer with multiple input clock signals or
parents, one of which can be selected as output. This clock does not
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/dts-coding-style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ Example::
#dma-cells = <1>;
clocks = <&clock_controller 0>, <&clock_controller 1>;
clock-names = "bus", "host";
#address-cells = <1>;
#size-cells = <1>;
vendor,custom-property = <2>;
status = "disabled";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ properties:

local-bd-address: true

qcom,local-bd-address-broken:
type: boolean
description:
boot firmware is incorrectly passing the address in big-endian order

required:
- compatible
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
TI Davinci DSP devices
=======================

Binding status: Unstable - Subject to changes for DT representation of clocks
and resets

The TI Davinci family of SoCs usually contains a TI DSP Core sub-system that
is used to offload some of the processor-intensive tasks or algorithms, for
achieving various system level goals.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ properties:
ranges: true

patternProperties:
"^clock-controller@[0-9a-z]+$":
"^clock-controller@[0-9a-f]+$":
$ref: /schemas/clock/fsl,flexspi-clock.yaml#

required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ properties:
ranges: true

patternProperties:
"^interrupt-controller@[a-z0-9]+$":
"^interrupt-controller@[a-f0-9]+$":
$ref: /schemas/interrupt-controller/fsl,ls-extirq.yaml#

required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ properties:
be implemented in an always-on power domain."

patternProperties:
'^frame@[0-9a-z]*$':
'^frame@[0-9a-f]+$':
type: object
additionalProperties: false
description: A timer node has up to 8 frame sub-nodes, each with the following properties.
Expand Down
38 changes: 34 additions & 4 deletions Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ properties:
- qcom,msm8996-ufshc
- qcom,msm8998-ufshc
- qcom,sa8775p-ufshc
- qcom,sc7180-ufshc
- qcom,sc7280-ufshc
- qcom,sc8180x-ufshc
- qcom,sc8280xp-ufshc
- qcom,sdm845-ufshc
- qcom,sm6115-ufshc
- qcom,sm6125-ufshc
- qcom,sm6350-ufshc
- qcom,sm8150-ufshc
- qcom,sm8250-ufshc
Expand All @@ -42,11 +45,11 @@ properties:
- const: jedec,ufs-2.0

clocks:
minItems: 8
minItems: 7
maxItems: 11

clock-names:
minItems: 8
minItems: 7
maxItems: 11

dma-coherent: true
Expand Down Expand Up @@ -112,6 +115,31 @@ required:
allOf:
- $ref: ufs-common.yaml

- if:
properties:
compatible:
contains:
enum:
- qcom,sc7180-ufshc
then:
properties:
clocks:
minItems: 7
maxItems: 7
clock-names:
items:
- const: core_clk
- const: bus_aggr_clk
- const: iface_clk
- const: core_clk_unipro
- const: ref_clk
- const: tx_lane0_sync_clk
- const: rx_lane0_sync_clk
reg:
maxItems: 1
reg-names:
maxItems: 1

- if:
properties:
compatible:
Expand All @@ -120,6 +148,7 @@ allOf:
- qcom,msm8998-ufshc
- qcom,sa8775p-ufshc
- qcom,sc7280-ufshc
- qcom,sc8180x-ufshc
- qcom,sc8280xp-ufshc
- qcom,sm8250-ufshc
- qcom,sm8350-ufshc
Expand Down Expand Up @@ -215,6 +244,7 @@ allOf:
contains:
enum:
- qcom,sm6115-ufshc
- qcom,sm6125-ufshc
then:
properties:
clocks:
Expand Down Expand Up @@ -248,15 +278,15 @@ allOf:
reg:
maxItems: 1
clocks:
minItems: 8
minItems: 7
maxItems: 8
else:
properties:
reg:
minItems: 1
maxItems: 2
clocks:
minItems: 8
minItems: 7
maxItems: 11

unevaluatedProperties: false
Expand Down
Loading

0 comments on commit 77dff0c

Please sign in to comment.