Commit 899e373e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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()
  ...
parents 81f3affa 7877cb91

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer

Documentation/admin-guide/cifs/changes.rst

+2 −2
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ Changes 
See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary

information about fixes/improvements to CIFS/SMB2/SMB3 support (changes

to cifs.ko module) by kernel version (and cifs internal module version).

This may be easier to read than parsing the output of "git log fs/cifs"

by release.
 
This may be easier to read than parsing the output of

"git log fs/smb/client" by release.

Documentation/admin-guide/cifs/usage.rst

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Installation instructions 


If you have built the CIFS vfs as module (successfully) simply

type ``make modules_install`` (or if you prefer, manually copy the file to

the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).

the modules directory e.g. /lib/modules/6.3.0-060300-generic/kernel/fs/smb/client/cifs.ko).



If you have built the CIFS vfs into the kernel itself, follow the instructions

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 
and maximum number of simultaneous requests to one server can be configured.

Changing these from their defaults is not recommended. By executing modinfo::



	modinfo kernel/fs/cifs/cifs.ko

	modinfo <path to cifs.ko>



on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made

on kernel/fs/smb/client/cifs.ko the list of configuration changes that can be made

at module initialization time (by running insmod cifs.ko) can be seen.



Recommendations

===============



To improve security the SMB2.1 dialect or later (usually will get SMB3) is now

To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is now

the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"

on mount (or vers=2.0 for Windows Vista).  Note that the CIFS (vers=1.0) is

much older and less secure than the default dialect SMB3 which includes

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

+27 −22
Original line number Diff line number Diff line
@@ -215,12 +215,14 @@ again. 
   reduce the compile time enormously, especially if you are running an

   universal kernel from a commodity Linux distribution.



   There is a catch: the make target 'localmodconfig' will disable kernel

   features you have not directly or indirectly through some program utilized

   since you booted the system. You can reduce or nearly eliminate that risk by

   using tricks outlined in the reference section; for quick testing purposes

   that risk is often negligible, but it is an aspect you want to keep in mind

   in case your kernel behaves oddly.

   There is a catch: 'localmodconfig' is likely to disable kernel features you

   did not use since you booted your Linux -- like drivers for currently

   disconnected peripherals or a virtualization software not haven't used yet.

   You can reduce or nearly eliminate that risk with tricks the reference

   section outlines; but when building a kernel just for quick testing purposes

   it is often negligible if such features are missing. But you should keep that

   aspect in mind when using a kernel built with this make target, as it might

   be the reason why something you only use occasionally stopped working.



   [:ref:`details<configuration>`]
@@ -271,6 +273,9 @@ again. 
   does nothing at all; in that case you have to manually install your kernel,

   as outlined in the reference section.



   If you are running a immutable Linux distribution, check its documentation

   and the web to find out how to install your own kernel there.



   [:ref:`details<install>`]



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

   history::



     git fetch --shallow-exclude=v6.1 origin



   If you modified the sources (for example by applying a patch), you now need

   to discard those modifications; that's because git otherwise will not be able

   to switch to the sources of another version due to potential conflicting

   changes::



     git reset --hard

     git fetch --shallow-exclude=v6.0 origin



   Now checkout the version you are interested in, as explained above::

   Now switch to the version you are interested in -- but be aware the command

   used here will discard any modifications you performed, as they would

   conflict with the sources you want to checkout::



     git checkout --detach origin/master

     git checkout --force --detach origin/master



   At this point you might want to patch the sources again or set/modify a build

   tag, as explained earlier; afterwards adjust the build configuration to the

   new codebase and build your next kernel::

   tag, as explained earlier. Afterwards adjust the build configuration to the

   new codebase using olddefconfig, which will now adjust the configuration file

   you prepared earlier using localmodconfig  (~/linux/.config) for your next

   kernel::



     # reminder: if you want to apply patches, do it at this point

     # reminder: you might want to update your build tag at this point

     make olddefconfig



   Now build your kernel::



     make -j $(nproc --all)



   Install the kernel as outlined above::

   Afterwards install the kernel as outlined above::



     command -v installkernel && sudo make modules_install install
@@ -584,10 +589,10 @@ versions and individual commits at hand at any time:: 
    curl -L \

      https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/clone.bundle \

      -o linux-stable.git.bundle

    git clone clone.bundle ~/linux/

    git clone linux-stable.git.bundle ~/linux/

    rm linux-stable.git.bundle

    cd ~/linux/

    git remote set-url origin

    git remote set-url origin \

      https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git

    git fetch origin

    git checkout --detach origin/master