Skip to content

L
linux
Commit a7ac3140 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 38 deletions
Documentation/admin-guide/cifs/usage.rst
View file @ a7ac3140
...@@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and ...@@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and
using weaker password hashes is 0x37037 (lanman, using weaker password hashes is 0x37037 (lanman,
plaintext, ntlm, ntlmv2, signing allowed). Some plaintext, ntlm, ntlmv2, signing allowed). Some
SecurityFlags require the corresponding menuconfig SecurityFlags require the corresponding menuconfig
options to be enabled (lanman and plaintext require options to be enabled. Enabling plaintext
CONFIG_CIFS_WEAK_PW_HASH for example). Enabling authentication currently requires also enabling
plaintext authentication currently requires also lanman authentication in the security flags
enabling lanman authentication in the security flags
because the cifs module only supports sending because the cifs module only supports sending
laintext passwords using the older lanman dialect laintext passwords using the older lanman dialect
form of the session setup SMB. (e.g. for authentication form of the session setup SMB. (e.g. for authentication
......
Documentation/admin-guide/devices.txt
View file @ a7ac3140
...@@ -2339,13 +2339,7 @@ ...@@ -2339,13 +2339,7 @@
disks (see major number 3) except that the limit on disks (see major number 3) except that the limit on
partitions is 31. partitions is 31.
162 char Raw block device interface 162 char Used for (now removed) 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'
163 char 163 char
......
arch/arm/configs/cm_x300_defconfig
View file @ a7ac3140
...@@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y ...@@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_1=m
......
arch/arm/configs/ezx_defconfig
View file @ a7ac3140
...@@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y ...@@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_SMB_FS=m CONFIG_SMB_FS=m
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/arm/configs/imote2_defconfig
View file @ a7ac3140
...@@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y ...@@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_SMB_FS=m CONFIG_SMB_FS=m
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/arm/configs/nhk8815_defconfig
View file @ a7ac3140
...@@ -127,7 +127,6 @@ CONFIG_NFS_FS=y ...@@ -127,7 +127,6 @@ CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y CONFIG_NFS_V3_ACL=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_1=y
......
arch/arm/configs/pxa_defconfig
View file @ a7ac3140
...@@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y ...@@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y CONFIG_NFSD_V4=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_DEFAULT="utf8"
......
arch/arm/configs/spear13xx_defconfig
View file @ a7ac3140
...@@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y ...@@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
CONFIG_RAW_DRIVER=y CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y CONFIG_SPI=y
......
arch/arm/configs/spear3xx_defconfig
View file @ a7ac3140
...@@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y ...@@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
CONFIG_RAW_DRIVER=y CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y CONFIG_SPI=y
......
arch/arm/configs/spear6xx_defconfig
View file @ a7ac3140
...@@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y ...@@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y
CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_RAW_DRIVER=y CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y CONFIG_SPI=y
......
arch/mips/configs/decstation_64_defconfig
View file @ a7ac3140
...@@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y ...@@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT3_FS_SECURITY=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
......
arch/mips/configs/decstation_defconfig
View file @ a7ac3140
...@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y ...@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT3_FS_SECURITY=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
......
arch/mips/configs/decstation_r4k_defconfig
View file @ a7ac3140
...@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y ...@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT3_FS_SECURITY=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
......
arch/mips/configs/fuloong2e_defconfig
View file @ a7ac3140
...@@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y ...@@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y CONFIG_NFSD_V4=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_STATS2=y CONFIG_CIFS_STATS2=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_CIFS_DEBUG2=y CONFIG_CIFS_DEBUG2=y
......
arch/mips/configs/ip27_defconfig
View file @ a7ac3140
...@@ -223,7 +223,6 @@ CONFIG_TMD_HERMES=m ...@@ -223,7 +223,6 @@ CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m CONFIG_NORTEL_HERMES=m
CONFIG_P54_COMMON=m CONFIG_P54_COMMON=m
CONFIG_P54_PCI=m CONFIG_P54_PCI=m
CONFIG_PRISM54=m
CONFIG_LIBERTAS=m CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_THINFIRM=m CONFIG_LIBERTAS_THINFIRM=m
CONFIG_MWL8K=m CONFIG_MWL8K=m
......
arch/mips/configs/malta_defconfig
View file @ a7ac3140
...@@ -302,7 +302,6 @@ CONFIG_HOSTAP_FIRMWARE=y ...@@ -302,7 +302,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PCI=m
CONFIG_PRISM54=m
CONFIG_LIBERTAS=m CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV=y
CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_ELANTECH=y
......
arch/mips/configs/malta_kvm_defconfig
View file @ a7ac3140
...@@ -310,7 +310,6 @@ CONFIG_HOSTAP_FIRMWARE=y ...@@ -310,7 +310,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PCI=m
CONFIG_PRISM54=m
CONFIG_LIBERTAS=m CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV=y
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
......
arch/mips/configs/malta_qemu_32r6_defconfig
View file @ a7ac3140
...@@ -165,7 +165,6 @@ CONFIG_TMPFS=y ...@@ -165,7 +165,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/mips/configs/maltaaprp_defconfig
View file @ a7ac3140
...@@ -166,7 +166,6 @@ CONFIG_TMPFS=y ...@@ -166,7 +166,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/mips/configs/maltasmvp_defconfig
View file @ a7ac3140
...@@ -167,7 +167,6 @@ CONFIG_TMPFS=y ...@@ -167,7 +167,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/mips/configs/maltasmvp_eva_defconfig
View file @ a7ac3140
...@@ -169,7 +169,6 @@ CONFIG_TMPFS=y ...@@ -169,7 +169,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/mips/configs/maltaup_defconfig
View file @ a7ac3140
...@@ -165,7 +165,6 @@ CONFIG_TMPFS=y ...@@ -165,7 +165,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
......
arch/mips/configs/maltaup_xpa_defconfig
View file @ a7ac3140
...@@ -309,7 +309,6 @@ CONFIG_HOSTAP_FIRMWARE=y ...@@ -309,7 +309,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PCI=m
CONFIG_PRISM54=m
CONFIG_LIBERTAS=m CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV=y
CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_ELANTECH=y
......
arch/powerpc/configs/pmac32_defconfig
View file @ a7ac3140
...@@ -169,7 +169,6 @@ CONFIG_USB_USBNET=m ...@@ -169,7 +169,6 @@ CONFIG_USB_USBNET=m
CONFIG_B43=m CONFIG_B43=m
CONFIG_B43LEGACY=m CONFIG_B43LEGACY=m
CONFIG_P54_COMMON=m CONFIG_P54_COMMON=m
CONFIG_PRISM54=m
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
......
arch/powerpc/configs/ppc6xx_defconfig
View file @ a7ac3140
...@@ -1022,7 +1022,6 @@ CONFIG_NFSD=m ...@@ -1022,7 +1022,6 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y CONFIG_NFSD_V4=y
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
......
arch/powerpc/configs/pseries_defconfig
View file @ a7ac3140
...@@ -189,7 +189,6 @@ CONFIG_HVCS=m ...@@ -189,7 +189,6 @@ CONFIG_HVCS=m
CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_CONSOLE=m
CONFIG_IBM_BSR=m CONFIG_IBM_BSR=m
CONFIG_RAW_DRIVER=y CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=1024
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y CONFIG_FIRMWARE_EDID=y
......
arch/sh/configs/titan_defconfig
View file @ a7ac3140
...@@ -242,7 +242,6 @@ CONFIG_NFSD=y ...@@ -242,7 +242,6 @@ CONFIG_NFSD=y
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_SMB_FS=m CONFIG_SMB_FS=m
CONFIG_CIFS=m CONFIG_CIFS=m
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_ASCII=m CONFIG_NLS_ASCII=m
......
include/asm-generic/error-injection.h
View file @ a7ac3140
...@@ -20,7 +20,7 @@ struct pt_regs; ...@@ -20,7 +20,7 @@ struct pt_regs;
#ifdef CONFIG_FUNCTION_ERROR_INJECTION #ifdef CONFIG_FUNCTION_ERROR_INJECTION
/* /*
* Whitelist ganerating macro. Specify functions which can be * Whitelist generating macro. Specify functions which can be
* error-injectable using this macro. * error-injectable using this macro.
*/ */
#define ALLOW_ERROR_INJECTION(fname, _etype) \ #define ALLOW_ERROR_INJECTION(fname, _etype) \
...@@ -29,7 +29,7 @@ static struct error_injection_entry __used \ ...@@ -29,7 +29,7 @@ static struct error_injection_entry __used \
_eil_addr_##fname = { \ _eil_addr_##fname = { \
.addr = (unsigned long)fname, \ .addr = (unsigned long)fname, \
.etype = EI_ETYPE_##_etype, \ .etype = EI_ETYPE_##_etype, \
}; }
void override_function_with_return(struct pt_regs *regs); void override_function_with_return(struct pt_regs *regs);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7