Commit a7ac3140 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic cleanups from Arnd Bergmann:
 "A few minor cleanups for cross-architecture code: Alexandre Ghiti
  deals with removing some leftovers from drivers and features that have
  been removed, and Wasin Thonkaew has a cosmetic change"

* tag 'asm-generic-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue
  arch: Remove leftovers from prism54 wireless driver
  arch: Remove leftovers from mandatory file locking
  Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
  Documentation, arch: Remove leftovers from raw device
parents bb4ed26e 733e4175

Documentation/admin-guide/cifs/usage.rst

+3 −4
Original line number Diff line number Diff line
@@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and 
			using weaker password hashes is 0x37037 (lanman,

			plaintext, ntlm, ntlmv2, signing allowed).  Some

			SecurityFlags require the corresponding menuconfig

			options to be enabled (lanman and plaintext require

			CONFIG_CIFS_WEAK_PW_HASH for example).  Enabling

			plaintext authentication currently requires also

			enabling lanman authentication in the security flags

			options to be enabled.  Enabling plaintext

			authentication currently requires also enabling

			lanman authentication in the security flags

			because the cifs module only supports sending

			laintext passwords using the older lanman dialect

			form of the session setup SMB.  (e.g. for authentication

Documentation/admin-guide/devices.txt

+1 −7
Original line number Diff line number Diff line
@@ -2339,13 +2339,7 @@ 
		disks (see major number 3) except that the limit on

		partitions is 31.



 162 char	Raw block device interface

		  0 = /dev/rawctl	Raw I/O control device

		  1 = /dev/raw/raw1	First raw I/O device

		  2 = /dev/raw/raw2	Second raw I/O device

		    ...

		 max minor number of raw device is set by kernel config

		 MAX_RAW_DEVS or raw module parameter 'max_raw_devs'

 162 char	Used for (now removed) raw block device interface



 163 char

arch/arm/configs/cm_x300_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y 
CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

arch/arm/configs/ezx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_CIFS_STATS=y

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_CODEPAGE_437=m

arch/arm/configs/imote2_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_CIFS_STATS=y

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_CODEPAGE_437=m