Skip to content

Commit 899e373

Browse files
committed
Merge tag 'v6.4-rc4' into v4l_for_linus
Linux 6.4-rc4 * tag 'v6.4-rc4': (606 commits) Linux 6.4-rc4 cxl: Explicitly initialize resources when media is not ready x86: re-introduce support for ERMS copies for user space accesses NVMe: Add MAXIO 1602 to bogus nid list. module: error out early on concurrent load of the same module file x86/topology: Fix erroneous smp_num_siblings on Intel Hybrid platforms cpufreq: amd-pstate: Update policy->cur in amd_pstate_adjust_perf() io_uring: unlock sqd->lock before sq thread release CPU MAINTAINERS: update arm64 Microchip entries udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated(). net: phy: mscc: enable VSC8501/2 RGMII RX clock net: phy: mscc: remove unnecessary phydev locking net: phy: mscc: add support for VSC8501 net: phy: mscc: add VSC8502 to MODULE_DEVICE_TABLE net/handshake: Enable the SNI extension to work properly net/handshake: Unpin sock->file if a handshake is cancelled net/handshake: handshake_genl_notify() shouldn't ignore @flags net/handshake: Fix uninitialized local variable net/handshake: Fix handshake_dup() ref counting net/handshake: Remove unneeded check from handshake_dup() ...
2 parents 81f3aff + 7877cb9 commit 899e373

834 files changed

Lines changed: 6534 additions & 3334 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/cifs/changes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Changes
55
See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary
66
information about fixes/improvements to CIFS/SMB2/SMB3 support (changes
77
to cifs.ko module) by kernel version (and cifs internal module version).
8-
This may be easier to read than parsing the output of "git log fs/cifs"
9-
by release.
8+
This may be easier to read than parsing the output of
9+
"git log fs/smb/client" by release.

Documentation/admin-guide/cifs/usage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Installation instructions
4545

4646
If you have built the CIFS vfs as module (successfully) simply
4747
type ``make modules_install`` (or if you prefer, manually copy the file to
48-
the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).
48+
the modules directory e.g. /lib/modules/6.3.0-060300-generic/kernel/fs/smb/client/cifs.ko).
4949

5050
If you have built the CIFS vfs into the kernel itself, follow the instructions
5151
for your distribution on how to install a new kernel (usually you
@@ -66,15 +66,15 @@ If cifs is built as a module, then the size and number of network buffers
6666
and maximum number of simultaneous requests to one server can be configured.
6767
Changing these from their defaults is not recommended. By executing modinfo::
6868

69-
modinfo kernel/fs/cifs/cifs.ko
69+
modinfo <path to cifs.ko>
7070

71-
on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made
71+
on kernel/fs/smb/client/cifs.ko the list of configuration changes that can be made
7272
at module initialization time (by running insmod cifs.ko) can be seen.
7373

7474
Recommendations
7575
===============
7676

77-
To improve security the SMB2.1 dialect or later (usually will get SMB3) is now
77+
To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is now
7878
the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"
7979
on mount (or vers=2.0 for Windows Vista). Note that the CIFS (vers=1.0) is
8080
much older and less secure than the default dialect SMB3 which includes

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/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/interrupt-controller/arm,gic-v3.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ properties:
166166
resets:
167167
maxItems: 1
168168

169+
mediatek,broken-save-restore-fw:
170+
type: boolean
171+
description:
172+
Asserts that the firmware on this device has issues saving and restoring
173+
GICR registers when the GIC redistributors are powered off.
174+
169175
dependencies:
170176
mbi-ranges: [ msi-controller ]
171177
msi-controller: [ mbi-ranges ]

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)