Skip to content

Commit 6c594a8

Browse files
committed
regulator: Merge up v6.4-rc3
Merge up v6.4-rc3 in order to get fixes to improve the stability of my CI.
2 parents e6beda5 + 44c026a commit 6c594a8

622 files changed

Lines changed: 6679 additions & 3839 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
364364
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
365365
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
366366
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
367+
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
368+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
369+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
370+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
371+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
367372
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
368373
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
369374
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18
17061706
S: D-69126 Heidelberg
17071707
S: Germany
17081708

1709+
N: Neil Horman
1710+
M: nhorman@tuxdriver.com
1711+
D: SCTP protocol maintainer.
1712+
17091713
N: Simon Horman
17101714
M: horms@verge.net.au
17111715
D: Renesas ARM/ARM64 SoC maintainer

Documentation/admin-guide/quickly-build-trimmed-linux.rst

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,14 @@ again.
215215
reduce the compile time enormously, especially if you are running an
216216
universal kernel from a commodity Linux distribution.
217217

218-
There is a catch: the make target 'localmodconfig' will disable kernel
219-
features you have not directly or indirectly through some program utilized
220-
since you booted the system. You can reduce or nearly eliminate that risk by
221-
using tricks outlined in the reference section; for quick testing purposes
222-
that risk is often negligible, but it is an aspect you want to keep in mind
223-
in case your kernel behaves oddly.
218+
There is a catch: 'localmodconfig' is likely to disable kernel features you
219+
did not use since you booted your Linux -- like drivers for currently
220+
disconnected peripherals or a virtualization software not haven't used yet.
221+
You can reduce or nearly eliminate that risk with tricks the reference
222+
section outlines; but when building a kernel just for quick testing purposes
223+
it is often negligible if such features are missing. But you should keep that
224+
aspect in mind when using a kernel built with this make target, as it might
225+
be the reason why something you only use occasionally stopped working.
224226

225227
[:ref:`details<configuration>`]
226228

@@ -271,6 +273,9 @@ again.
271273
does nothing at all; in that case you have to manually install your kernel,
272274
as outlined in the reference section.
273275

276+
If you are running a immutable Linux distribution, check its documentation
277+
and the web to find out how to install your own kernel there.
278+
274279
[:ref:`details<install>`]
275280

276281
.. _another_sbs:
@@ -291,29 +296,29 @@ again.
291296
version you care about, as git otherwise might retrieve the entire commit
292297
history::
293298

294-
git fetch --shallow-exclude=v6.1 origin
295-
296-
If you modified the sources (for example by applying a patch), you now need
297-
to discard those modifications; that's because git otherwise will not be able
298-
to switch to the sources of another version due to potential conflicting
299-
changes::
300-
301-
git reset --hard
299+
git fetch --shallow-exclude=v6.0 origin
302300

303-
Now checkout the version you are interested in, as explained above::
301+
Now switch to the version you are interested in -- but be aware the command
302+
used here will discard any modifications you performed, as they would
303+
conflict with the sources you want to checkout::
304304

305-
git checkout --detach origin/master
305+
git checkout --force --detach origin/master
306306

307307
At this point you might want to patch the sources again or set/modify a build
308-
tag, as explained earlier; afterwards adjust the build configuration to the
309-
new codebase and build your next kernel::
308+
tag, as explained earlier. Afterwards adjust the build configuration to the
309+
new codebase using olddefconfig, which will now adjust the configuration file
310+
you prepared earlier using localmodconfig (~/linux/.config) for your next
311+
kernel::
310312

311313
# reminder: if you want to apply patches, do it at this point
312314
# reminder: you might want to update your build tag at this point
313315
make olddefconfig
316+
317+
Now build your kernel::
318+
314319
make -j $(nproc --all)
315320

316-
Install the kernel as outlined above::
321+
Afterwards install the kernel as outlined above::
317322

318323
command -v installkernel && sudo make modules_install install
319324

@@ -584,11 +589,11 @@ versions and individual commits at hand at any time::
584589
curl -L \
585590
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/clone.bundle \
586591
-o linux-stable.git.bundle
587-
git clone clone.bundle ~/linux/
592+
git clone linux-stable.git.bundle ~/linux/
588593
rm linux-stable.git.bundle
589594
cd ~/linux/
590-
git remote set-url origin
591-
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
595+
git remote set-url origin \
596+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
592597
git fetch origin
593598
git checkout --detach origin/master
594599

Documentation/block/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Block
1818
kyber-iosched
1919
null_blk
2020
pr
21-
request
2221
stat
2322
switching-sched
2423
writeback_cache_control

Documentation/block/request.rst

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

Documentation/cdrom/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. SPDX-License-Identifier: GPL-2.0
22
3-
=====
4-
cdrom
5-
=====
3+
======
4+
CD-ROM
5+
======
66

77
.. toctree::
88
:maxdepth: 1

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
maxItems: 1
3333

3434
iommus:
35-
maxItems: 1
35+
maxItems: 4
3636

3737
power-domains:
3838
maxItems: 1

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,18 @@ properties:
8282
Indicates if the DSI controller is driving a panel which needs
8383
2 DSI links.
8484
85+
qcom,master-dsi:
86+
type: boolean
87+
description: |
88+
Indicates if the DSI controller is the master DSI controller when
89+
qcom,dual-dsi-mode enabled.
90+
91+
qcom,sync-dual-dsi:
92+
type: boolean
93+
description: |
94+
Indicates if the DSI controller needs to sync the other DSI controller
95+
with MIPI DCS commands when qcom,dual-dsi-mode enabled.
96+
8597
assigned-clocks:
8698
minItems: 2
8799
maxItems: 4

Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ properties:
4949

5050
properties:
5151
data-lanes:
52+
minItems: 1
5253
maxItems: 2
5354

5455
required:

Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@ properties:
2121

2222
st,can-primary:
2323
description:
24-
Primary and secondary mode of the bxCAN peripheral is only relevant
25-
if the chip has two CAN peripherals. In that case they share some
26-
of the required logic.
24+
Primary mode of the bxCAN peripheral is only relevant if the chip has
25+
two CAN peripherals in dual CAN configuration. In that case they share
26+
some of the required logic.
27+
Not to be used if the peripheral is in single CAN configuration.
2728
To avoid misunderstandings, it should be noted that ST documentation
28-
uses the terms master/slave instead of primary/secondary.
29+
uses the terms master instead of primary.
30+
type: boolean
31+
32+
st,can-secondary:
33+
description:
34+
Secondary mode of the bxCAN peripheral is only relevant if the chip
35+
has two CAN peripherals in dual CAN configuration. In that case they
36+
share some of the required logic.
37+
Not to be used if the peripheral is in single CAN configuration.
38+
To avoid misunderstandings, it should be noted that ST documentation
39+
uses the terms slave instead of secondary.
2940
type: boolean
3041

3142
reg:

0 commit comments

Comments
 (0)