Commit a03a91bd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/sfc/tc.c
  622ab656 ("sfc: fix error unwinds in TC offload")
  b6583d5e ("sfc: support TC decap rules matching on enc_src_port")

net/mptcp/protocol.c
  5b825727 ("mptcp: add annotations around msk->subflow accesses")
  e76c8ef5 ("mptcp: refactor mptcp_stream_accept()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4ff3dfc9 714069da

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

+6 −0
Original line number Diff line number Diff line
@@ -166,6 +166,12 @@ properties: 
  resets:

    maxItems: 1



  mediatek,broken-save-restore-fw:

    type: boolean

    description:

      Asserts that the firmware on this device has issues saving and restoring

      GICR registers when the GIC redistributors are powered off.



dependencies:

  mbi-ranges: [ msi-controller ]

  msi-controller: [ mbi-ranges ]

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ properties: 
    description:

      size of memory intended as internal memory for endpoints

      buffers expressed in KB

    $ref: /schemas/types.yaml#/definitions/uint32

    $ref: /schemas/types.yaml#/definitions/uint16



  cdns,phyrst-a-enable:

    description: Enable resetting of PHY if Rx fail is detected

Documentation/filesystems/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ Documentation for filesystem implementations. 
   befs

   bfs

   btrfs

   cifs/index

   ceph

   coda

   configfs
@@ -111,6 +110,7 @@ Documentation for filesystem implementations. 
   ramfs-rootfs-initramfs

   relay

   romfs

   smb/index

   spufs/index

   squashfs

   sysfs