Skip to content

Commit 3fd799c

Browse files
Merge pull request #44 from torvalds/master
Sync update
2 parents 53d35ad + 63804fe commit 3fd799c

File tree

353 files changed

+3473
-1544
lines changed

Some content is hidden

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

353 files changed

+3473
-1544
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -878,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
878879
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
879880
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
880881
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
882+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
883+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
881884
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
882885
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
883886
Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,10 @@ S: Markham, Ontario
22312231
S: L3R 8B2
22322232
S: Canada
22332233

2234+
N: Krzysztof Kozlowski
2235+
E: krzk@kernel.org
2236+
D: NFC network subsystem and drivers maintainer
2237+
22342238
N: Christian Krafft
22352239
D: PowerPC Cell support
22362240

Documentation/admin-guide/laptops/alienware-wmi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ information.
105105

106106
Manual fan control on the other hand, is not exposed directly by the AWCC
107107
interface. Instead it let's us control a fan `boost` value. This `boost` value
108-
has the following aproximate behavior over the fan pwm:
108+
has the following approximate behavior over the fan pwm:
109109

110110
::
111111

Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ISA string ordering in /proc/cpuinfo
77
------------------------------------
88

99
The canonical order of ISA extension names in the ISA string is defined in
10-
chapter 27 of the unprivileged specification.
10+
Chapter 27 of the RISC-V Instruction Set Manual Volume I Unprivileged ISA
11+
(Document Version 20191213).
12+
1113
The specification uses vague wording, such as should, when it comes to ordering,
1214
so for our purposes the following rules apply:
1315

Documentation/arch/x86/amd_hsmp.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set of mailbox registers.
1414

1515
More details on the interface can be found in chapter
1616
"7 Host System Management Port (HSMP)" of the family/model PPR
17-
Eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip
17+
Eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50
1818

1919

2020
HSMP interface is supported on EPYC line of server CPUs and MI300A (APU).
@@ -185,7 +185,7 @@ what happened. The transaction returns 0 on success.
185185

186186
More details on the interface and message definitions can be found in chapter
187187
"7 Host System Management Port (HSMP)" of the respective family/model PPR
188-
eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip
188+
eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50
189189

190190
User space C-APIs are made available by linking against the esmi library,
191191
which is provided by the E-SMS project https://www.amd.com/en/developer/e-sms.html.

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers:
1111
- Jitao shi <jitao.shi@mediatek.com>
1212

1313
description: |
14-
MediaTek DP and eDP are different hardwares and there are some features
14+
MediaTek DP and eDP are different hardware and there are some features
1515
which are not supported for eDP. For example, audio is not supported for
1616
eDP. Therefore, we need to use two different compatibles to describe them.
1717
In addition, We just need to enable the power domain of DP, so the clock

Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,37 @@ allOf:
7474
- description: aggre UFS CARD AXI clock
7575
- description: RPMH CC IPA clock
7676

77+
- if:
78+
properties:
79+
compatible:
80+
contains:
81+
enum:
82+
- qcom,sa8775p-config-noc
83+
- qcom,sa8775p-dc-noc
84+
- qcom,sa8775p-gem-noc
85+
- qcom,sa8775p-gpdsp-anoc
86+
- qcom,sa8775p-lpass-ag-noc
87+
- qcom,sa8775p-mmss-noc
88+
- qcom,sa8775p-nspa-noc
89+
- qcom,sa8775p-nspb-noc
90+
- qcom,sa8775p-pcie-anoc
91+
- qcom,sa8775p-system-noc
92+
then:
93+
properties:
94+
clocks: false
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
101+
- qcom,sa8775p-clk-virt
102+
- qcom,sa8775p-mc-virt
103+
then:
104+
properties:
105+
reg: false
106+
clocks: false
107+
77108
unevaluatedProperties: false
78109

79110
examples:

Documentation/misc-devices/amd-sbi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and SB Temperature Sensor Interface (SB-TSI)).
1515
More details on the interface can be found in chapter
1616
"5 Advanced Platform Management Link (APML)" of the family/model PPR [1]_.
1717

18-
.. [1] https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip
18+
.. [1] https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50
1919
2020
2121
SBRMI device

Documentation/netlink/specs/fou.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ attribute-sets:
3939
-
4040
name: ipproto
4141
type: u8
42+
checks:
43+
min: 1
4244
-
4345
name: type
4446
type: u8

Documentation/process/conclave.rst

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
Linux kernel project continuity
4+
===============================
5+
6+
The Linux kernel development project is widely distributed, with over
7+
100 maintainers each working to keep changes moving through their own
8+
repositories. The final step, though, is a centralized one where changes
9+
are pulled into the mainline repository. That is normally done by Linus
10+
Torvalds but, as was demonstrated by the 4.19 release in 2018, there are
11+
others who can do that work when the need arises.
12+
13+
Should the maintainers of that repository become unwilling or unable to
14+
do that work going forward (including facilitating a transition), the
15+
project will need to find one or more replacements without delay. The
16+
process by which that will be done is listed below. $ORGANIZER is the
17+
last Maintainer Summit organizer or the current Linux Foundation (LF)
18+
Technical Advisory Board (TAB) Chair as a backup.
19+
20+
- Within 72 hours, $ORGANIZER will open a discussion with the invitees
21+
of the most recently concluded Maintainers Summit. A meeting of those
22+
invitees and the TAB, either online or in-person, will be set as soon
23+
as possible in a way that maximizes the number of people who can
24+
participate.
25+
26+
- If there has been no Maintainers Summit in the last 15 months, the set of
27+
invitees for this meeting will be determined by the TAB.
28+
29+
- The invitees to this meeting may bring in other maintainers as needed.
30+
31+
- This meeting, chaired by $ORGANIZER, will consider options for the
32+
ongoing management of the top-level kernel repository consistent with
33+
the expectation that it maximizes the long term health of the project
34+
and its community.
35+
36+
- Within two weeks, a representative of this group will communicate to the
37+
broader community, using the ksummit@lists.linux.dev mailing list, what
38+
the next steps will be.
39+
40+
The Linux Foundation, as guided by the TAB, will take the steps
41+
necessary to support and implement this plan.

0 commit comments

Comments
 (0)