Commit 2076b2a4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.4-rc5 into tty-next 



We need the tty fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 49c80922 9561de3a

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/fpga/lattice,sysconfig.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Lattice Slave SPI sysCONFIG FPGA manager



maintainers:

  - Ivan Bornyakov <i.bornyakov@metrotek.ru>

  - Vladimir Georgiev <v.georgiev@metrotek.ru>



description: |

  Lattice sysCONFIG port, which is used for FPGA configuration, among others,

Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Microchip Polarfire FPGA manager.



maintainers:

  - Ivan Bornyakov <i.bornyakov@metrotek.ru>

  - Vladimir Georgiev <v.georgiev@metrotek.ru>



description:

  Device Tree Bindings for Microchip Polarfire FPGA Manager using slave SPI to

Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ properties: 
  power-domains:

    maxItems: 1



  vref-supply:

    description: |

      External ADC reference voltage supply on VREFH pad. If VERID[MVI] is

      set, there are additional, internal reference voltages selectable.

      VREFH1 is always from VREFH pad.



  "#io-channel-cells":

    const: 1
@@ -72,6 +78,7 @@ examples: 
            assigned-clocks = <&clk IMX_SC_R_ADC_0>;

            assigned-clock-rates = <24000000>;

            power-domains = <&pd IMX_SC_R_ADC_0>;

            vref-supply = <&reg_1v8>;

            #io-channel-cells = <1>;

        };

    };