Commit 5f004bca authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v6.4' into rdma.git for-next 

Linux 6.4

Resolve conflicts between rdma rc and next in rxe_cq matching linux-next:

drivers/infiniband/sw/rxe/rxe_cq.c:
  https://lore.kernel.org/r/20230622115246.365d30ad@canb.auug.org.au



Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 4251f631 6995e2de

.mailmap

+8 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
@@ -233,6 +235,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com> 
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -364,6 +367,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.de>

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

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

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

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>

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> <bug-track@fisher-privat.net>

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

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

CREDITS

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

S: D-69126 Heidelberg

S: Germany

S: Germany





N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

N: Simon Horman

M: horms@verge.net.au

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer

D: Renesas ARM/ARM64 SoC maintainer

Documentation/admin-guide/cgroup-v2.rst

+10 −12
Original line number Original line Diff line number Diff line
@@ -1213,23 +1213,25 @@ PAGE_SIZE multiple when read back. 
	A read-write single value file which exists on non-root

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".

	cgroups.  The default is "max".





	Memory usage throttle limit.  This is the main mechanism to

	Memory usage throttle limit.  If a cgroup's usage goes

	control memory usage of a cgroup.  If a cgroup's usage goes

	over the high boundary, the processes of the cgroup are

	over the high boundary, the processes of the cgroup are

	throttled and put under heavy reclaim pressure.

	throttled and put under heavy reclaim pressure.





	Going over the high limit never invokes the OOM killer and

	Going over the high limit never invokes the OOM killer and

	under extreme conditions the limit may be breached.

	under extreme conditions the limit may be breached. The high

	limit should be used in scenarios where an external process

	monitors the limited cgroup to alleviate heavy reclaim

	pressure.





  memory.max

  memory.max

	A read-write single value file which exists on non-root

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".

	cgroups.  The default is "max".





	Memory usage hard limit.  This is the final protection

	Memory usage hard limit.  This is the main mechanism to limit

	mechanism.  If a cgroup's memory usage reaches this limit and

	memory usage of a cgroup.  If a cgroup's memory usage reaches

	can't be reduced, the OOM killer is invoked in the cgroup.

	this limit and can't be reduced, the OOM killer is invoked in

	Under certain circumstances, the usage may go over the limit

	the cgroup. Under certain circumstances, the usage may go

	temporarily.

	over the limit temporarily.





	In default configuration regular 0-order allocations always

	In default configuration regular 0-order allocations always

	succeed unless OOM killer chooses current task as a victim.

	succeed unless OOM killer chooses current task as a victim.
@@ -1238,10 +1240,6 @@ PAGE_SIZE multiple when read back. 
	Caller could retry them differently, return into userspace

	Caller could retry them differently, return into userspace

	as -ENOMEM or silently ignore in cases like disk readahead.

	as -ENOMEM or silently ignore in cases like disk readahead.





	This is the ultimate protection mechanism.  As long as the

	high limit is used and monitored properly, this limit's

	utility is limited to providing the final safety net.



  memory.reclaim

  memory.reclaim

	A write-only nested-keyed file which exists for all cgroups.

	A write-only nested-keyed file which exists for all cgroups.

Documentation/admin-guide/cifs/changes.rst

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

See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary

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

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

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

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"

This may be easier to read than parsing the output of

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

Documentation/admin-guide/cifs/usage.rst

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




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

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

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

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

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

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.

and maximum number of simultaneous requests to one server can be configured.

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

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.

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





Recommendations

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"

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

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

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