[PATCH] configs: only visit generic/powerpc once
by Paul Bolle
The rule that generates kernel-ppc64le-debug.config visits
configs/generic/powerpc twice. Stop doing that.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
configs/config_generation | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/config_generation b/configs/config_generation
index 97683c517ef5..b3385fd1cff9 100644
--- a/configs/config_generation
+++ b/configs/config_generation
@@ -18,7 +18,7 @@ i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86
# ppc64le
ppc64le=generic:generic-powerpc
-ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug
+ppc64le-debug=generic:generic-powerpc:debug
# s390x
s390x=generic:generic-s390x
--
2.17.2
4 years, 1 month
configs: remove CONFIG_SUN50I_A64_UNSTABLE_TIMER
by Paul Bolle
The patch that added the Kconfig symbol SUN50I_A64_UNSTABLE_TIMER was
dropped in commit 60a8ce36abae7 ("Raspberry Pi DT updates, Update
AllWinner A64 timer errata workaround"). So it's safe to drop it from
the configuration generation system too.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
Eyuball tested.
.../fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER | 1 -
kernel-aarch64-debug.config | 1 -
kernel-aarch64.config | 1 -
3 files changed, 3 deletions(-)
delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER b/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER
deleted file mode 100644
index 1bf3b8e41a23..000000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 1746eae95cd7..a2b53c2d5d6b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5986,7 +5986,6 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A64_CCU=y
-CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
CONFIG_SUN50I_DE2_BUS=y
CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
CONFIG_SUN50I_H6_CCU=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6c9684769048..904fa0df8fa8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5964,7 +5964,6 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A64_CCU=y
-CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
CONFIG_SUN50I_DE2_BUS=y
CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
CONFIG_SUN50I_H6_CCU=y
--
2.17.2
4 years, 2 months
Remove all Kconfig symbols dropped in v5.1-rc1
by Paul Bolle
There are 23 Kconfig symbols referenced in the files used for
configuration generation and in the shipped .config files that were
dropped in upstream v5.1-rc1. The references to these symbols can be
safely removed.
These symbols are:
CONFIG_AD7152
CONFIG_DEFAULT_SECURITY_DAC
CONFIG_DEFAULT_SECURITY_SELINUX
CONFIG_EARLY_PRINTK_EFI
CONFIG_EXOFS_FS
CONFIG_EXT4_ENCRYPTION
CONFIG_F2FS_FS_ENCRYPTION
CONFIG_FB_XGI
CONFIG_MTD_MT81xx_NOR
CONFIG_NFT_CHAIN_NAT_IPV4
CONFIG_NFT_CHAIN_NAT_IPV6
CONFIG_NFT_MASQ_IPV4
CONFIG_NFT_MASQ_IPV6
CONFIG_NFT_REDIR_IPV4
CONFIG_NFT_REDIR_IPV6
CONFIG_SCSI_OSD_DEBUG
CONFIG_SCSI_OSD_DPRINT_SENSE
CONFIG_SCSI_OSD_INITIATOR
CONFIG_SCSI_OSD_ULD
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
CONFIG_SND_AUDIO_GRAPH_SCU_CARD
CONFIG_SND_SIMPLE_SCU_CARD
CONFIG_UBIFS_FS_ENCRYPTION
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
grep tested only. Fingers crossed!
configs/fedora/generic/CONFIG_AD7152 | 1 -
.../generic/CONFIG_DEFAULT_SECURITY_DAC | 1 -
.../generic/CONFIG_DEFAULT_SECURITY_SELINUX | 1 -
configs/fedora/generic/CONFIG_EXOFS_FS | 1 -
configs/fedora/generic/CONFIG_EXT4_ENCRYPTION | 1 -
.../fedora/generic/CONFIG_F2FS_FS_ENCRYPTION | 1 -
configs/fedora/generic/CONFIG_FB_XGI | 1 -
.../fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 | 1 -
.../fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 | 1 -
configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 | 1 -
configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 | 1 -
configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 | 1 -
configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 | 1 -
configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG | 1 -
.../generic/CONFIG_SCSI_OSD_DPRINT_SENSE | 1 -
.../fedora/generic/CONFIG_SCSI_OSD_INITIATOR | 1 -
configs/fedora/generic/CONFIG_SCSI_OSD_ULD | 1 -
.../CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE | 1 -
.../generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD | 1 -
.../fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD | 1 -
.../fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION | 1 -
.../generic/arm/armv7/CONFIG_MTD_MT81xx_NOR | 1 -
.../generic/x86/CONFIG_EARLY_PRINTK_EFI | 1 -
kernel-aarch64-debug.config | 21 ------------------
kernel-aarch64.config | 21 ------------------
kernel-armv7hl-debug.config | 22 -------------------
kernel-armv7hl-lpae-debug.config | 22 -------------------
kernel-armv7hl-lpae.config | 22 -------------------
kernel-armv7hl.config | 22 -------------------
kernel-i686-debug.config | 22 -------------------
kernel-i686.config | 22 -------------------
kernel-ppc64le-debug.config | 21 ------------------
kernel-ppc64le.config | 21 ------------------
kernel-s390x-debug.config | 21 ------------------
kernel-s390x.config | 21 ------------------
kernel-x86_64-debug.config | 22 -------------------
kernel-x86_64.config | 22 -------------------
37 files changed, 325 deletions(-)
delete mode 100644 configs/fedora/generic/CONFIG_AD7152
delete mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC
delete mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX
delete mode 100644 configs/fedora/generic/CONFIG_EXOFS_FS
delete mode 100644 configs/fedora/generic/CONFIG_EXT4_ENCRYPTION
delete mode 100644 configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION
delete mode 100644 configs/fedora/generic/CONFIG_FB_XGI
delete mode 100644 configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4
delete mode 100644 configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6
delete mode 100644 configs/fedora/generic/CONFIG_NFT_MASQ_IPV4
delete mode 100644 configs/fedora/generic/CONFIG_NFT_MASQ_IPV6
delete mode 100644 configs/fedora/generic/CONFIG_NFT_REDIR_IPV4
delete mode 100644 configs/fedora/generic/CONFIG_NFT_REDIR_IPV6
delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG
delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE
delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR
delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_ULD
delete mode 100644 configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
delete mode 100644 configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
delete mode 100644 configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD
delete mode 100644 configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION
delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR
delete mode 100644 configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI
diff --git a/configs/fedora/generic/CONFIG_AD7152 b/configs/fedora/generic/CONFIG_AD7152
deleted file mode 100644
index 24be7e64ee94..000000000000
--- a/configs/fedora/generic/CONFIG_AD7152
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AD7152 is not set
diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC
deleted file mode 100644
index a3af1ff70d08..000000000000
--- a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEFAULT_SECURITY_DAC is not set
diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX
deleted file mode 100644
index ef2f9974a530..000000000000
--- a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_SECURITY_SELINUX=y
diff --git a/configs/fedora/generic/CONFIG_EXOFS_FS b/configs/fedora/generic/CONFIG_EXOFS_FS
deleted file mode 100644
index 46dfd9d1cb31..000000000000
--- a/configs/fedora/generic/CONFIG_EXOFS_FS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXOFS_FS is not set
diff --git a/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION b/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION
deleted file mode 100644
index 2758bcf0b356..000000000000
--- a/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXT4_ENCRYPTION=y
diff --git a/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION b/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION
deleted file mode 100644
index 9be753d68bad..000000000000
--- a/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_F2FS_FS_ENCRYPTION is not set
diff --git a/configs/fedora/generic/CONFIG_FB_XGI b/configs/fedora/generic/CONFIG_FB_XGI
deleted file mode 100644
index 6f60e1ed2300..000000000000
--- a/configs/fedora/generic/CONFIG_FB_XGI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_XGI is not set
diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 b/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4
deleted file mode 100644
index dabdbc46a5f8..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 b/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6
deleted file mode 100644
index 1afb99374a98..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_CHAIN_NAT_IPV6=m
diff --git a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 b/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4
deleted file mode 100644
index 5a5ec1c61ae1..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_MASQ_IPV4=m
diff --git a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 b/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6
deleted file mode 100644
index d1e703f9bcb8..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_MASQ_IPV6=m
diff --git a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 b/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4
deleted file mode 100644
index 8f2025454c9d..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_REDIR_IPV4=m
diff --git a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 b/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6
deleted file mode 100644
index 23f2aa25b80a..000000000000
--- a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_REDIR_IPV6=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG b/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG
deleted file mode 100644
index 94c77fa09be3..000000000000
--- a/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_OSD_DEBUG is not set
diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE b/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE
deleted file mode 100644
index ff51990d8f8b..000000000000
--- a/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR b/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR
deleted file mode 100644
index 052e3e9c911a..000000000000
--- a/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCSI_OSD_INITIATOR=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_ULD b/configs/fedora/generic/CONFIG_SCSI_OSD_ULD
deleted file mode 100644
index 34f6a7895e09..000000000000
--- a/configs/fedora/generic/CONFIG_SCSI_OSD_ULD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCSI_OSD_ULD=m
diff --git a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE b/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
deleted file mode 100644
index afb675430b64..000000000000
--- a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
diff --git a/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD b/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
deleted file mode 100644
index 12d870d7766e..000000000000
--- a/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
diff --git a/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD b/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD
deleted file mode 100644
index e50c183741e1..000000000000
--- a/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SIMPLE_SCU_CARD=m
diff --git a/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION b/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION
deleted file mode 100644
index 163dac774803..000000000000
--- a/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UBIFS_FS_ENCRYPTION=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR b/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR
deleted file mode 100644
index 204cf13ab2ab..000000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTD_MT81xx_NOR is not set
diff --git a/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI b/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI
deleted file mode 100644
index b895363c6782..000000000000
--- a/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EARLY_PRINTK_EFI=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e8fbd67730c8..57845ecbbf5a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -96,7 +96,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1292,8 +1291,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DETECT_HUNG_TASK=y
# CONFIG_DEV_APPLETALK is not set
@@ -1664,7 +1661,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1673,7 +1669,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1693,7 +1688,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1769,7 +1763,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB_XILINX=m
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -4000,8 +3993,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -4021,8 +4012,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -4032,8 +4021,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5106,10 +5093,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5173,7 +5156,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5498,7 +5480,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5631,7 +5612,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -6332,7 +6312,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 4b905ba5804e..b42f6f852ac9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -96,7 +96,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1285,8 +1284,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_DEV_APPLETALK is not set
@@ -1656,7 +1653,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1665,7 +1661,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1685,7 +1680,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1753,7 +1747,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB_XILINX=m
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -3980,8 +3973,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -4001,8 +3992,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -4012,8 +4001,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5085,10 +5072,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5152,7 +5135,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5477,7 +5459,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5609,7 +5590,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -6310,7 +6290,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ac6dbc17bdad..fce534d92189 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1295,8 +1294,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
CONFIG_DETECT_HUNG_TASK=y
@@ -1710,7 +1707,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1719,7 +1715,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1747,7 +1742,6 @@ CONFIG_EXYNOS_THERMAL=y
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1825,7 +1819,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -3636,7 +3629,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
CONFIG_MTD_NAND_CAFE=m
@@ -4125,8 +4117,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -4146,8 +4136,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -4157,8 +4145,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5300,10 +5286,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5366,7 +5348,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5705,7 +5686,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5845,7 +5825,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_AC97_CODEC=m
@@ -6639,7 +6618,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 75c0a85c274e..f2097fa9d754 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1251,8 +1250,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
CONFIG_DETECT_HUNG_TASK=y
@@ -1636,7 +1633,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1645,7 +1641,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1672,7 +1667,6 @@ CONFIG_EXYNOS_THERMAL=y
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1748,7 +1742,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -3487,7 +3480,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
CONFIG_MTD_NAND_CAFE=m
@@ -3970,8 +3962,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3991,8 +3981,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -4002,8 +3990,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5023,10 +5009,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5089,7 +5071,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5412,7 +5393,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5548,7 +5528,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_AC97_CODEC=m
@@ -6261,7 +6240,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index e38c242f2227..622440645f27 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1244,8 +1243,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_DETECT_HUNG_TASK is not set
@@ -1629,7 +1626,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1638,7 +1634,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1665,7 +1660,6 @@ CONFIG_EXYNOS_THERMAL=y
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1733,7 +1727,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -3468,7 +3461,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
CONFIG_MTD_NAND_CAFE=m
@@ -3951,8 +3943,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3972,8 +3962,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3983,8 +3971,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5003,10 +4989,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5069,7 +5051,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5392,7 +5373,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5527,7 +5507,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_AC97_CODEC=m
@@ -6240,7 +6219,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e37385a436a8..be4db8f7f84d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1288,8 +1287,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_DETECT_HUNG_TASK is not set
@@ -1703,7 +1700,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1712,7 +1708,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1740,7 +1735,6 @@ CONFIG_EXYNOS_THERMAL=y
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1810,7 +1804,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
@@ -3617,7 +3610,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_MT81xx_NOR is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
CONFIG_MTD_NAND_CAFE=m
@@ -4106,8 +4098,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -4127,8 +4117,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -4138,8 +4126,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -5280,10 +5266,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -5346,7 +5328,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5685,7 +5666,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5824,7 +5804,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_AC97_CODEC=m
@@ -6618,7 +6597,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index dfe91a77bc4d..9634bf0f5d69 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -104,7 +104,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1089,8 +1088,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_RBTN=m
@@ -1377,7 +1374,6 @@ CONFIG_E1000E=m
CONFIG_E1000=m
CONFIG_E100=m
CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
CONFIG_EARLY_PRINTK_USB_XDBC=y
# CONFIG_EBC_C384_WDT is not set
CONFIG_ECHO=m
@@ -1451,7 +1447,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1460,7 +1455,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1479,7 +1473,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1569,7 +1562,6 @@ CONFIG_FB_VGA16=m
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3762,8 +3754,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3783,8 +3773,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3794,8 +3782,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4688,10 +4674,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4748,7 +4730,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5062,7 +5043,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5184,7 +5164,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -5820,7 +5799,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-i686.config b/kernel-i686.config
index b59b97f81bef..9cb41e257437 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -104,7 +104,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1081,8 +1080,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_RBTN=m
@@ -1368,7 +1365,6 @@ CONFIG_E1000E=m
CONFIG_E1000=m
CONFIG_E100=m
CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
CONFIG_EARLY_PRINTK_USB_XDBC=y
# CONFIG_EBC_C384_WDT is not set
CONFIG_ECHO=m
@@ -1442,7 +1438,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1451,7 +1446,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1470,7 +1464,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1552,7 +1545,6 @@ CONFIG_FB_VGA16=m
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3743,8 +3735,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3764,8 +3754,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3775,8 +3763,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4668,10 +4654,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4728,7 +4710,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5042,7 +5023,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5163,7 +5143,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -5799,7 +5778,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index bdbf119d23f0..7169d3f08523 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -67,7 +67,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1010,8 +1009,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEV_APPLETALK=m
@@ -1313,7 +1310,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1322,7 +1318,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1341,7 +1336,6 @@ CONFIG_EXTRA_TARGETS=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1419,7 +1413,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3487,8 +3480,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3508,8 +3499,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3519,8 +3508,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4392,10 +4379,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4448,7 +4431,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -4749,7 +4731,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -4871,7 +4852,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
# CONFIG_SND_SOC_ADAU1701 is not set
CONFIG_SND_SOC_ADAU1761_I2C=m
@@ -5453,7 +5433,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7fff95122a5a..a43dd1ce4514 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -67,7 +67,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1002,8 +1001,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_DEV_APPLETALK=m
@@ -1304,7 +1301,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1313,7 +1309,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1332,7 +1327,6 @@ CONFIG_EXTRA_TARGETS=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1402,7 +1396,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3466,8 +3459,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3487,8 +3478,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3498,8 +3487,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4370,10 +4357,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4426,7 +4409,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -4727,7 +4709,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -4848,7 +4829,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
# CONFIG_SND_SOC_ADAU1701 is not set
CONFIG_SND_SOC_ADAU1761_I2C=m
@@ -5430,7 +5410,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 197817317a50..8d2e304f7593 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1018,8 +1017,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEV_APPLETALK=m
@@ -1320,7 +1317,6 @@ CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
CONFIG_EXPOLINE_AUTO=y
# CONFIG_EXPOLINE_FULL is not set
@@ -1330,7 +1326,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1348,7 +1343,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1422,7 +1416,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FCOE_FNIC=m
# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
@@ -3457,8 +3450,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3478,8 +3469,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3489,8 +3478,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4340,10 +4327,6 @@ CONFIG_SCSI_MVSAS_TASKLET=y
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_PMCRAID is not set
# CONFIG_SCSI_PPA is not set
@@ -4396,7 +4379,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -4693,7 +4675,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -4814,7 +4795,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
# CONFIG_SND_SOC_ADAU1701 is not set
CONFIG_SND_SOC_ADAU1761_I2C=m
@@ -5395,7 +5375,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2cad3793d60e..a72714ceb9b7 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -68,7 +68,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1010,8 +1009,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_DEV_APPLETALK=m
@@ -1311,7 +1308,6 @@ CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
CONFIG_EXPOLINE_AUTO=y
# CONFIG_EXPOLINE_FULL is not set
@@ -1321,7 +1317,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1339,7 +1334,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1405,7 +1399,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FCOE_FNIC=m
# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
@@ -3436,8 +3429,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3457,8 +3448,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3468,8 +3457,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4318,10 +4305,6 @@ CONFIG_SCSI_MVSAS_TASKLET=y
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_PMCRAID is not set
# CONFIG_SCSI_PPA is not set
@@ -4374,7 +4357,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -4671,7 +4653,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -4791,7 +4772,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
# CONFIG_SND_SOC_ADAU1701 is not set
CONFIG_SND_SOC_ADAU1761_I2C=m
@@ -5372,7 +5352,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 35ccdec08109..e173506d8a62 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -107,7 +107,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1129,8 +1128,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_RBTN=m
@@ -1421,7 +1418,6 @@ CONFIG_E1000E=m
CONFIG_E1000=m
CONFIG_E100=m
CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
CONFIG_EARLY_PRINTK_USB_XDBC=y
# CONFIG_EBC_C384_WDT is not set
CONFIG_ECHO=m
@@ -1496,7 +1492,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1505,7 +1500,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_DEBUG=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1527,7 +1521,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1612,7 +1605,6 @@ CONFIG_FB_VGA16=m
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3806,8 +3798,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3827,8 +3817,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3838,8 +3826,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4734,10 +4720,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4793,7 +4775,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5113,7 +5094,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5235,7 +5215,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -5875,7 +5854,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 83459b6b2f76..4f5460c49851 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -107,7 +107,6 @@ CONFIG_AD5272=m
# CONFIG_AD5933 is not set
CONFIG_AD7124=m
# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
# CONFIG_AD7192 is not set
# CONFIG_AD7266 is not set
# CONFIG_AD7280 is not set
@@ -1121,8 +1120,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_DEFAULT_RENO is not set
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_RBTN=m
@@ -1412,7 +1409,6 @@ CONFIG_E1000E=m
CONFIG_E1000=m
CONFIG_E100=m
CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
CONFIG_EARLY_PRINTK_USB_XDBC=y
# CONFIG_EBC_C384_WDT is not set
CONFIG_ECHO=m
@@ -1487,7 +1483,6 @@ CONFIG_ETHERNET=y
CONFIG_ETHOC=m
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
# CONFIG_EXPERT is not set
# CONFIG_EXPOLINE_AUTO is not set
CONFIG_EXPOLINE_FULL=y
@@ -1496,7 +1491,6 @@ CONFIG_EXPORTFS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -1518,7 +1512,6 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
@@ -1595,7 +1588,6 @@ CONFIG_FB_VGA16=m
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
CONFIG_FB=y
CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
@@ -3787,8 +3779,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
@@ -3808,8 +3798,6 @@ CONFIG_NFT_HASH=m
CONFIG_NFT_LIMIT=m
# CONFIG_NFTL is not set
CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_NAT=m
CONFIG_NFT_NUMGEN=m
@@ -3819,8 +3807,6 @@ CONFIG_NF_TPROXY_IPV4=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
@@ -4714,10 +4700,6 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_MYRB=m
CONFIG_SCSI_MYRS=m
# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_PM8001=m
CONFIG_SCSI_PMCRAID=m
# CONFIG_SCSI_PPA is not set
@@ -4773,7 +4755,6 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_PATH is not set
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -5093,7 +5074,6 @@ CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BCD2000=m
@@ -5214,7 +5194,6 @@ CONFIG_SND_SEQUENCER_OSS=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SOC_AC97_CODEC=m
# CONFIG_SND_SOC_ADAU1701 is not set
@@ -5854,7 +5833,6 @@ CONFIG_TYPHOON=m
CONFIG_UBIFS_ATIME_SUPPORT=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_SECURITY=y
CONFIG_UBIFS_FS_XATTR=y
--
2.17.2
4 years, 2 months
Remove three Kconfig symbols dropped before v5.0
by Paul Bolle
Three Kconfig symbols were added to upstream v5.0-rc1 but dropped before
v5.0 was released (for various reasons): FB_LOGO_CENTER, RESCTRL, and
X86_RESCTRL. Remove them from our configuration generation system too.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
grep tested. Fingers crossed!
configs/fedora/generic/CONFIG_FB_LOGO_CENTER | 1 -
configs/fedora/generic/x86/CONFIG_RESCTRL | 1 -
configs/fedora/generic/x86/CONFIG_X86_RESCTRL | 1 -
kernel-aarch64-debug.config | 1 -
kernel-aarch64.config | 1 -
kernel-armv7hl-debug.config | 1 -
kernel-armv7hl-lpae-debug.config | 1 -
kernel-armv7hl-lpae.config | 1 -
kernel-armv7hl.config | 1 -
kernel-i686-debug.config | 3 ---
kernel-i686.config | 3 ---
kernel-ppc64le-debug.config | 1 -
kernel-ppc64le.config | 1 -
kernel-s390x-debug.config | 1 -
kernel-s390x.config | 1 -
kernel-x86_64-debug.config | 3 ---
kernel-x86_64.config | 3 ---
17 files changed, 25 deletions(-)
delete mode 100644 configs/fedora/generic/CONFIG_FB_LOGO_CENTER
delete mode 100644 configs/fedora/generic/x86/CONFIG_RESCTRL
delete mode 100644 configs/fedora/generic/x86/CONFIG_X86_RESCTRL
diff --git a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER b/configs/fedora/generic/CONFIG_FB_LOGO_CENTER
deleted file mode 100644
index 4678650029fe..000000000000
--- a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_LOGO_CENTER is not set
diff --git a/configs/fedora/generic/x86/CONFIG_RESCTRL b/configs/fedora/generic/x86/CONFIG_RESCTRL
deleted file mode 100644
index 1822f0b7a122..000000000000
--- a/configs/fedora/generic/x86/CONFIG_RESCTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RESCTRL=y
diff --git a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL b/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
deleted file mode 100644
index 81d50f7c6cb0..000000000000
--- a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_RESCTRL=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a2b53c2d5d6b..e8fbd67730c8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1734,7 +1734,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 904fa0df8fa8..4b905ba5804e 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1718,7 +1718,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 51ec4d1f89af..ac6dbc17bdad 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1789,7 +1789,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_IMX is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 33c2d4d298ae..75c0a85c274e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1713,7 +1713,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 783532a9a845..e38c242f2227 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1698,7 +1698,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 0bd7d82b980d..e37385a436a8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1774,7 +1774,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_IMX is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index beaf55e2bfbf..dfe91a77bc4d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1530,7 +1530,6 @@ CONFIG_FB_I810=m
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -4403,7 +4402,6 @@ CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_RESET_TI_SYSCON is not set
CONFIG_RETPOLINE=y
@@ -6494,7 +6492,6 @@ CONFIG_X86_PTDUMP=y
# CONFIG_X86_RDC321X is not set
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
CONFIG_X86_RESERVE_LOW=64
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 7c2ead4ffdf0..b59b97f81bef 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1513,7 +1513,6 @@ CONFIG_FB_I810=m
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -4383,7 +4382,6 @@ CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_RESET_TI_SYSCON is not set
CONFIG_RETPOLINE=y
@@ -6473,7 +6471,6 @@ CONFIG_X86_POWERNOW_K8=m
# CONFIG_X86_RDC321X is not set
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
CONFIG_X86_RESERVE_LOW=64
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ed796c797cb2..bdbf119d23f0 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1382,7 +1382,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a921ba2f3148..7fff95122a5a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1365,7 +1365,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 46c72feb6e5c..197817317a50 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1387,7 +1387,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d1727fbe6361..2cad3793d60e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1370,7 +1370,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LOGO_CENTER is not set
CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2bf7fb1fd01b..35ccdec08109 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1575,7 +1575,6 @@ CONFIG_FB_I810=m
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -4446,7 +4445,6 @@ CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_RESET_TI_SYSCON is not set
CONFIG_RETPOLINE=y
@@ -6543,7 +6541,6 @@ CONFIG_X86_PM_TIMER=y
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_PTDUMP=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
CONFIG_X86_RESERVE_LOW=64
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SYSFB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f538fa6f81a8..83459b6b2f76 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1558,7 +1558,6 @@ CONFIG_FB_I810=m
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -4426,7 +4425,6 @@ CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
-CONFIG_RESCTRL=y
# CONFIG_RESET_ATTACK_MITIGATION is not set
# CONFIG_RESET_TI_SYSCON is not set
CONFIG_RETPOLINE=y
@@ -6522,7 +6520,6 @@ CONFIG_X86_PM_TIMER=y
CONFIG_X86_POWERNOW_K8=m
# CONFIG_X86_PTDUMP is not set
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
CONFIG_X86_RESERVE_LOW=64
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SYSFB is not set
--
2.17.2
4 years, 2 months
[PATCH 1/2] Fix typo CROS_EC_DEBUGFS
by Paul Bolle
CROS_EC_DEBUGFS should be CONFIG_CROS_EC_DEBUGFS.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_DEBUGFS | 2 +-
kernel-x86_64-debug.config | 1 -
kernel-x86_64.config | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_DEBUGFS b/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_DEBUGFS
index ed6647bbb0c8..06903f17cc05 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_DEBUGFS
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_CROS_EC_DEBUGFS
@@ -1 +1 @@
-# CROS_EC_DEBUGFS is not set
+# CONFIG_CROS_EC_DEBUGFS is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 060aeec369a9..f7dbcf008410 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6652,4 +6652,3 @@ CONFIG_ZSWAP=y
# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
# CONFIG_ZYNQMP_PM_DOMAINS is not set
# CONFIG_ZYNQMP_POWER is not set
-# CROS_EC_DEBUGFS is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 1cf5d598c616..1f1ca0d53dd9 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6631,4 +6631,3 @@ CONFIG_ZSWAP=y
# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
# CONFIG_ZYNQMP_PM_DOMAINS is not set
# CONFIG_ZYNQMP_POWER is not set
-# CROS_EC_DEBUGFS is not set
--
2.17.2
4 years, 2 months
[PATCH] Fix filename typo CONFIG_STACKINIT
by Paul Bolle
CONFIG_STACKINIT should be CONFIG_TEST_STACKINIT, even though this typo
has no effect on the build.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
.../fedora/generic/{CONFIG_STACKINIT => CONFIG_TEST_STACKINIT} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename configs/fedora/generic/{CONFIG_STACKINIT => CONFIG_TEST_STACKINIT} (100%)
diff --git a/configs/fedora/generic/CONFIG_STACKINIT b/configs/fedora/generic/CONFIG_TEST_STACKINIT
similarity index 100%
rename from configs/fedora/generic/CONFIG_STACKINIT
rename to configs/fedora/generic/CONFIG_TEST_STACKINIT
--
2.17.2
4 years, 2 months
[PATCH] Remove a patch that still touches userspace tools
by Paul Bolle
The userspace tools were split out into kernel-tools in 2017. Remove a
patch that still touches them.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
...io-Use-event-header-from-kernel-tree.patch | 64 -------------------
kernel.spec | 3 -
2 files changed, 67 deletions(-)
delete mode 100644 0001-iio-Use-event-header-from-kernel-tree.patch
diff --git a/0001-iio-Use-event-header-from-kernel-tree.patch b/0001-iio-Use-event-header-from-kernel-tree.patch
deleted file mode 100644
index 1724db3fdf2d..000000000000
--- a/0001-iio-Use-event-header-from-kernel-tree.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0eadbb65c0026fb4eec89c54f6b48a0febd87f92 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott(a)redhat.com>
-Date: Fri, 9 Sep 2016 08:19:17 -0700
-Subject: [PATCH] iio: Use type header from kernel tree
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To: Jonathan Cameron <jic23(a)kernel.org>
-To: Hartmut Knaack <knaack.h(a)gmx.de>
-To: Lars-Peter Clausen <lars(a)metafoo.de>
-To: Peter Meerwald-Stadler <pmeerw(a)pmeerw.net>
-Cc: linux-iio(a)vger.kernel.org
-Cc: linux-kernel(a)vger.kernel.org
-
-
-The iio tools have been updated as new event types have been added to
-the kernel. The tools currently use the standard system headers which
-means that the system may not have the newest defintitions. This leads
-to build failures when building newer tools on older hosts:
-
-gcc -Wall -g -D_GNU_SOURCE -c -o iio_event_monitor.o
-iio_event_monitor.c
-iio_event_monitor.c:59:3: error: ‘IIO_UVINDEX’ undeclared here (not in a
-function)
- [IIO_UVINDEX] = "uvindex",
- ^~~~~~~~~~~
-iio_event_monitor.c:59:3: error: array index in initializer not of
-integer type
-iio_event_monitor.c:59:3: note: (near initialization for
-‘iio_chan_type_name_spec’)
-iio_event_monitor.c:97:3: error: ‘IIO_MOD_LIGHT_UV’ undeclared here (not
-in a function)
- [IIO_MOD_LIGHT_UV] = "uv",
- ^~~~~~~~~~~~~~~~
-iio_event_monitor.c:97:3: error: array index in initializer not of
-integer type
-iio_event_monitor.c:97:3: note: (near initialization for
-‘iio_modifier_names’)
-<builtin>: recipe for target 'iio_event_monitor.o' failed
-
-Switch to using the header from the kernel tree to ensure the newest
-defintions are always picked up.
-
-Signed-off-by: Laura Abbott <labbott(a)redhat.com>
----
- tools/iio/iio_event_monitor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
-index d9b7e0f..f02523d 100644
---- a/tools/iio/iio_event_monitor.c
-+++ b/tools/iio/iio_event_monitor.c
-@@ -26,7 +26,7 @@
- #include <sys/ioctl.h>
- #include "iio_utils.h"
- #include <linux/iio/events.h>
--#include <linux/iio/types.h>
-+#include "../../include/uapi/linux/iio/types.h"
-
- static const char * const iio_chan_type_name_spec[] = {
- [IIO_VOLTAGE] = "voltage",
---
-2.7.4
-
diff --git a/kernel.spec b/kernel.spec
index a2e11ef5c107..e7060df13f7e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -496,9 +496,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz
## compile fixes
-# ongoing complaint, full discussion delayed until ksummit/plumbers
-Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
-
%if !%{nopatches}
# Git trees.
--
2.17.2
4 years, 2 months
[PATCH] Drop six orphaned patches
by Paul Bolle
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
0001-Correct-warning-with-gcc9.patch | 35 ---
...tomatically-enforce-module-signature.patch | 217 ------------------
efi-Add-EFI_SECURE_BOOT-bit.patch | 43 ----
...ure-boot-if-shim-is-in-insecure-mode.patch | 58 -----
...nit-cleanup_module-aliases-as-__cold.patch | 149 ------------
...e-__crc32c_le_base-aliases-as-__pure.patch | 124 ----------
6 files changed, 626 deletions(-)
delete mode 100644 0001-Correct-warning-with-gcc9.patch
delete mode 100644 Add-option-to-automatically-enforce-module-signature.patch
delete mode 100644 efi-Add-EFI_SECURE_BOOT-bit.patch
delete mode 100644 efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
delete mode 100644 include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch
delete mode 100644 lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch
diff --git a/0001-Correct-warning-with-gcc9.patch b/0001-Correct-warning-with-gcc9.patch
deleted file mode 100644
index 9a5e9423041e..000000000000
--- a/0001-Correct-warning-with-gcc9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0de1315ee843713bafb9a59bc040a024f688c62a Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott(a)redhat.com>
-Date: Wed, 23 Jan 2019 13:56:47 +0100
-Subject: [PATCH] Correct warning with gcc9
-
-Suggested from Arnd
-
-Signed-off-by: Laura Abbott <labbott(a)redhat.com>
----
- include/linux/module.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 8fa38d3e7538..f2a24b59cca4 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -129,13 +129,13 @@ extern void cleanup_module(void);
- #define module_init(initfn) \
- static inline initcall_t __maybe_unused __inittest(void) \
- { return initfn; } \
-- int init_module(void) __attribute__((alias(#initfn)));
-+ int init_module(void) __attribute__((cold, alias(#initfn)));
-
- /* This is only required if you want to be unloadable. */
- #define module_exit(exitfn) \
- static inline exitcall_t __maybe_unused __exittest(void) \
- { return exitfn; } \
-- void cleanup_module(void) __attribute__((alias(#exitfn)));
-+ void cleanup_module(void) __attribute__((cold, alias(#exitfn)));
-
- #endif
-
---
-2.20.1
-
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
deleted file mode 100644
index ebabac62ee91..000000000000
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 6b6203b92cfb457a0669a9c87a29b360405bffc6 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <matthew.garrett(a)nebula.com>
-Date: Fri, 9 Aug 2013 18:36:30 -0400
-Subject: [PATCH 10/20] Add option to automatically enforce module signatures
- when in Secure Boot mode
-
-UEFI Secure Boot provides a mechanism for ensuring that the firmware will
-only load signed bootloaders and kernels. Certain use cases may also
-require that all kernel modules also be signed. Add a configuration option
-that enforces this automatically when enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett(a)nebula.com>
----
- Documentation/x86/zero-page.txt | 2 ++
- arch/x86/Kconfig | 11 ++++++
- arch/x86/boot/compressed/eboot.c | 66 +++++++++++++++++++++++++++++++++++
- arch/x86/include/uapi/asm/bootparam.h | 3 +-
- arch/x86/kernel/setup.c | 6 ++++
- include/linux/module.h | 6 ++++
- kernel/module.c | 7 ++++
- 7 files changed, 100 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
-index 95a4d34af3fd..b8527c6b7646 100644
---- a/Documentation/x86/zero-page.txt
-+++ b/Documentation/x86/zero-page.txt
-@@ -31,6 +31,8 @@ Offset Proto Name Meaning
- 1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below)
- 1EA/001 ALL edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer
- (below)
-+1EB/001 ALL kbd_status Numlock is enabled
-+1EC/001 ALL secure_boot Secure boot is enabled in the firmware
- 1EF/001 ALL sentinel Used to detect broken bootloaders
- 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
- 2D0/A00 ALL e820_map E820 memory map table
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index bada636d1065..d666ef8b616c 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1786,6 +1786,17 @@ config EFI_MIXED
-
- If unsure, say N.
-
-+config EFI_SECURE_BOOT_SIG_ENFORCE
-+ def_bool n
-+ depends on EFI
-+ prompt "Force module signing when UEFI Secure Boot is enabled"
-+ ---help---
-+ UEFI Secure Boot provides a mechanism for ensuring that the
-+ firmware will only load signed bootloaders and kernels. Certain
-+ use cases may also require that all kernel modules also be signed.
-+ Say Y here to automatically enable module signature enforcement
-+ when a system boots with UEFI Secure Boot enabled.
-+
- config SECCOMP
- def_bool y
- prompt "Enable seccomp to safely compute untrusted bytecode"
-diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index cc69e37548db..ebc85c1eefd6 100644
---- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -12,6 +12,7 @@
- #include <asm/efi.h>
- #include <asm/setup.h>
- #include <asm/desc.h>
-+#include <asm/bootparam_utils.h>
-
- #include "../string.h"
- #include "eboot.h"
-@@ -537,6 +538,67 @@ static void setup_efi_pci(struct boot_params *params)
- efi_call_early(free_pool, pci_handle);
- }
-
-+static int get_secure_boot(void)
-+{
-+ u8 sb, setup;
-+ unsigned long datasize = sizeof(sb);
-+ efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
-+ efi_status_t status;
-+
-+ status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+ L"SecureBoot", &var_guid, NULL, &datasize, &sb);
-+
-+ if (status != EFI_SUCCESS)
-+ return 0;
-+
-+ if (sb == 0)
-+ return 0;
-+
-+
-+ status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+ L"SetupMode", &var_guid, NULL, &datasize,
-+ &setup);
-+
-+ if (status != EFI_SUCCESS)
-+ return 0;
-+
-+ if (setup == 1)
-+ return 0;
-+
-+ return 1;
-+}
-+
-+
-+/*
-+ * See if we have Graphics Output Protocol
-+ */
-+static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
-+ unsigned long size)
-+{
-+ efi_status_t status;
-+ void **gop_handle = NULL;
-+
-+ status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
-+ size, (void **)&gop_handle);
-+ if (status != EFI_SUCCESS)
-+ return status;
-+
-+ status = efi_call_early(locate_handle,
-+ EFI_LOCATE_BY_PROTOCOL,
-+ proto, NULL, &size, gop_handle);
-+ if (status != EFI_SUCCESS)
-+ goto free_handle;
-+
-+ if (efi_early->is64)
-+ status = setup_gop64(si, proto, size, gop_handle);
-+ else
-+ status = setup_gop32(si, proto, size, gop_handle);
-+
-+free_handle:
-+ efi_call_early(free_pool, gop_handle);
-+ return status;
-+}
-+
- static efi_status_t
- setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
- {
-@@ -1094,6 +1156,10 @@ struct boot_params *efi_main(struct efi_config *c,
- else
- setup_boot_services32(efi_early);
-
-+ sanitize_boot_params(boot_params);
-+
-+ boot_params->secure_boot = get_secure_boot();
-+
- setup_graphics(boot_params);
-
- setup_efi_pci(boot_params);
-diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index c18ce67495fa..2b3e5427097b 100644
---- a/arch/x86/include/uapi/asm/bootparam.h
-+++ b/arch/x86/include/uapi/asm/bootparam.h
-@@ -134,7 +134,8 @@ struct boot_params {
- __u8 eddbuf_entries; /* 0x1e9 */
- __u8 edd_mbr_sig_buf_entries; /* 0x1ea */
- __u8 kbd_status; /* 0x1eb */
-- __u8 _pad5[3]; /* 0x1ec */
-+ __u8 secure_boot; /* 0x1ec */
-+ __u8 _pad5[2]; /* 0x1ed */
- /*
- * The sentinel is set to a nonzero value (0xff) in header.S.
- *
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index bbfbca5fea0c..d40e961753c9 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1160,6 +1160,12 @@ void __init setup_arch(char **cmdline_p)
-
- io_delay_init();
-
-+#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
-+ if (boot_params.secure_boot) {
-+ enforce_signed_modules();
-+ }
-+#endif
-+
- /*
- * Parse the ACPI tables for possible boot-time SMP configuration.
- */
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 05bd6c989a0c..32327704e18d 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -260,6 +260,12 @@ extern const typeof(name) __mod_##type##__##name##_device_table \
-
- struct notifier_block;
-
-+#ifdef CONFIG_MODULE_SIG
-+extern void enforce_signed_modules(void);
-+#else
-+static inline void enforce_signed_modules(void) {};
-+#endif
-+
- #ifdef CONFIG_MODULES
-
- extern int modules_disabled; /* for sysctl */
-diff --git a/kernel/module.c b/kernel/module.c
-index cb864505d020..cb1f1da69bf4 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -4285,6 +4285,13 @@ void module_layout(struct module *mod,
- EXPORT_SYMBOL(module_layout);
- #endif
-
-+#ifdef CONFIG_MODULE_SIG
-+void enforce_signed_modules(void)
-+{
-+ sig_enforce = true;
-+}
-+#endif
-+
- bool secure_modules(void)
- {
- #ifdef CONFIG_MODULE_SIG
---
-2.9.3
-
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch
deleted file mode 100644
index c440103221ce..000000000000
--- a/efi-Add-EFI_SECURE_BOOT-bit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a8883aff32f1e15b65e210462804aa2a9ab9a0b6 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer(a)fedoraproject.org>
-Date: Tue, 27 Aug 2013 13:33:03 -0400
-Subject: [PATCH 13/20] efi: Add EFI_SECURE_BOOT bit
-
-UEFI machines can be booted in Secure Boot mode. Add a EFI_SECURE_BOOT bit
-for use with efi_enabled.
-
-Signed-off-by: Josh Boyer <jwboyer(a)fedoraproject.org>
----
- arch/x86/kernel/setup.c | 2 ++
- include/linux/efi.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d40e961753c9..b93183336674 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1162,7 +1162,9 @@ void __init setup_arch(char **cmdline_p)
-
- #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
- if (boot_params.secure_boot) {
-+ set_bit(EFI_SECURE_BOOT, &efi.flags);
- enforce_signed_modules();
-+ pr_info("Secure boot enabled\n");
- }
- #endif
-
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ce943d5accfd..5af91b58afae 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -1046,6 +1046,7 @@ extern int __init efi_setup_pcdp_console(char *);
- #define EFI_ARCH_1 7 /* First arch-specific bit */
- #define EFI_DBG 8 /* Print additional debug info at runtime */
- #define EFI_NX_PE_DATA 9 /* Can runtime data regions be mapped non-executable? */
-+#define EFI_SECURE_BOOT 10 /* Are we in Secure Boot mode? */
-
- #ifdef CONFIG_EFI
- /*
---
-2.9.3
-
diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
deleted file mode 100644
index 761a66ff7392..000000000000
--- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d687d79620ea20511b2dbf77e74fdcf4d94981f9 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer(a)fedoraproject.org>
-Date: Tue, 5 Feb 2013 19:25:05 -0500
-Subject: [PATCH 12/20] efi: Disable secure boot if shim is in insecure mode
-
-A user can manually tell the shim boot loader to disable validation of
-images it loads. When a user does this, it creates a UEFI variable called
-MokSBState that does not have the runtime attribute set. Given that the
-user explicitly disabled validation, we can honor that and not enable
-secure boot mode if that variable is set.
-
-Signed-off-by: Josh Boyer <jwboyer(a)fedoraproject.org>
----
- arch/x86/boot/compressed/eboot.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index ebc85c1eefd6..50e027f388d8 100644
---- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -540,8 +540,9 @@ static void setup_efi_pci(struct boot_params *params)
-
- static int get_secure_boot(void)
- {
-- u8 sb, setup;
-+ u8 sb, setup, moksbstate;
- unsigned long datasize = sizeof(sb);
-+ u32 attr;
- efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
- efi_status_t status;
-
-@@ -565,6 +566,23 @@ static int get_secure_boot(void)
- if (setup == 1)
- return 0;
-
-+ /* See if a user has put shim into insecure_mode. If so, and the variable
-+ * doesn't have the runtime attribute set, we might as well honor that.
-+ */
-+ var_guid = EFI_SHIM_LOCK_GUID;
-+ status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+ L"MokSBState", &var_guid, &attr, &datasize,
-+ &moksbstate);
-+
-+ /* If it fails, we don't care why. Default to secure */
-+ if (status != EFI_SUCCESS)
-+ return 1;
-+
-+ if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) {
-+ if (moksbstate == 1)
-+ return 0;
-+ }
-+
- return 1;
- }
-
---
-2.9.3
-
diff --git a/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch b/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch
deleted file mode 100644
index f350e6f32cf3..000000000000
--- a/include-linux-module.h-mark-init-cleanup_module-aliases-as-__cold.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From patchwork Wed Jan 23 17:37:07 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
-X-Patchwork-Id: 1034989
-Return-Path: <SRS0=drEb=P7=vger.kernel.org=linux-kernel-owner(a)kernel.org>
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- by smtp.lore.kernel.org (Postfix) with ESMTP id A7D50C282C0
- for <linux-kernel(a)archiver.kernel.org>; Wed, 23 Jan 2019 17:38:31 +0000 (UTC)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.kernel.org (Postfix) with ESMTP id 7CE1F20870
- for <linux-kernel(a)archiver.kernel.org>; Wed, 23 Jan 2019 17:38:31 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
- dkim=pass (2048-bit key) header.d=gmail.com header.i=(a)gmail.com
- header.b="qdRA7oPl"
-Received: (majordomo(a)vger.kernel.org) by vger.kernel.org via listexpand
- id S1726152AbfAWRi3 (ORCPT
- <rfc822;linux-kernel(a)archiver.kernel.org>);
- Wed, 23 Jan 2019 12:38:29 -0500
-Received: from mail-wm1-f67.google.com ([209.85.128.67]:52719 "EHLO
- mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1725896AbfAWRi3 (ORCPT
- <rfc822;linux-kernel(a)vger.kernel.org>);
- Wed, 23 Jan 2019 12:38:29 -0500
-Received: by mail-wm1-f67.google.com with SMTP id m1so242485wml.2
- for <linux-kernel(a)vger.kernel.org>;
- Wed, 23 Jan 2019 09:38:27 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=20161025;
- h=date:from:to:cc:subject:message-id:mime-version:content-disposition
- :user-agent;
- bh=1joVTuHcQFv5PhIFvZBlpu1jeKwRQi2Ty1HKsqzNx+0=;
- b=qdRA7oPloipduZyiYE/EECaW/vCZup5EXmE5a1XgE9mc55H+TTPNNRTt44QJbQgbnn
- wTNksIkBx8Gs0k3pJI9QIDO2J5AipLN8OOoxkPiDIJtAC8buHzQrdTxFG/4Uxw7tRf8X
- A6PNyuUGr+02itkYIlALzEuDHvZna8yZx0zCeCDXF2IrGt0NBHZVTzz1XfX8LeQlCh9L
- hleyVdDQnDvwxA7dXqrA4UugXUlEqT8HnIAUdg8+/xubsXOSz9T/22+zc9pZ9uSHm2uq
- DpO/hgx1e5DONDN8T+sjjKCO0LnJ8Z9ZS0Huf+8W2XH1uxo48jSgXUOsygPQ36+8R/7t
- ng6Q==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version
- :content-disposition:user-agent;
- bh=1joVTuHcQFv5PhIFvZBlpu1jeKwRQi2Ty1HKsqzNx+0=;
- b=ZQrXdTIYsCSUGNJS1C0dn+gibvoSHb2o+kcUMGTbH6G2tag3Zy4vnfIcBT0xhmvPLq
- 5pU8jskcufXp0qQ0sivNsBpJYJCbsqqiChoivTs9WC4rxoM5G62Wi0pAZL59fGGDnmyV
- xjSTkSoxe8CiB+26BDzg52zkynkWC2v0OHgaM7/1lTeTqNxdYIvQ+hC4LXdy40bAP64/
- JIC1nET+KwewpPHJQc2u87ah4xp6nEjzO/4wTP3CUi4zbZPTU17oH007IAXhObL7JO0r
- XkRBJAgpcTKexfAJB7HnAUc4KLSv5L5Uz+Z14TusskTuK6njE11PE9GSJ7Z7lqufqJNZ
- Z4GQ==
-X-Gm-Message-State: AJcUukdaW+EjUkHLIrpaLWRYCoF9XYWdpSiPfNnJgu3VB9CW8t9xYlZJ
- NDU6hJ2AXvnDR+awfdjm6IU=
-X-Google-Smtp-Source:
- ALg8bN59XklA0HTVEDaLFI+8dguNdipIQWTlgIi23N78PjaLBzniLMXowf2nCpIra7boIidjtFvfYg==
-X-Received: by 2002:a1c:7c05:: with SMTP id x5mr3525198wmc.54.1548265106544;
- Wed, 23 Jan 2019 09:38:26 -0800 (PST)
-Received: from gmail.com (79.108.96.12.dyn.user.ono.com. [79.108.96.12])
- by smtp.gmail.com with ESMTPSA id
- r77sm74200791wmd.22.2019.01.23.09.38.25
- (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
- Wed, 23 Jan 2019 09:38:25 -0800 (PST)
-Date: Wed, 23 Jan 2019 18:37:07 +0100
-From: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
-To: Jessica Yu <jeyu(a)kernel.org>
-Cc: Laura Abbott <labbott(a)redhat.com>,
- Martin Sebor <msebor(a)gcc.gnu.org>, linux-kernel(a)vger.kernel.org
-Subject: [PATCH] include/linux/module.h: mark init/cleanup_module aliases as
- __cold
-Message-ID: <20190123173707.GA16603(a)gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: elm/2
-Sender: linux-kernel-owner(a)vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel(a)vger.kernel.org
-
-The upcoming GCC 9 release adds the -Wmissing-attributes warnings
-(enabled by -Wall), which trigger for all the init/cleanup_module
-aliases in the kernel (defined by the module_init/exit macros),
-ending up being very noisy.
-
-These aliases point to the __init/__exit functions of a module,
-which are defined as __cold (among other attributes). However,
-the aliases themselves do not have the __cold attribute.
-
-Since the compiler behaves differently when compiling a __cold
-function as well as when compiling paths leading to calls
-to __cold functions, the warning is trying to point out
-the possibly-forgotten attribute in the alias.
-
-In order to keep the warning enabled, we choose to silence
-the warning by marking the aliases as __cold. This is possible
-marking either the extern declaration, the definition, or both.
-In order to avoid changing the behavior of callers, we do it
-only in the definition of the aliases (since those are not
-seen by any other TU).
-
-Suggested-by: Martin Sebor <msebor(a)gcc.gnu.org>
-Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
----
-Note that an alternative is using the new copy attribute
-introduced by GCC 9 (Martin told me about it, as well as the
-new warning).
-
-What I am concerned about using __copy is that I am not sure
-we should be copying all the attributes (even if some are
-blacklisted by the copy itself), since:
- - We have unknown-to-GCC attributes (e.g. from plugins).
- - We wouldn't enjoy the fix for older compilers
- (e.g. if the fix had an actual impact).
-
-So here I took the conservative approach for the moment,
-and we can discuss/apply whether another solution is best.
-
-Jessica: please review what I explain in the commit message.
-Do we actually want the __cold attribute in the declaration
-as well? If yes, AFAIK, GCC would assume paths that end up
-calling the __init/__exit functions are not meant to be taken
-(but when we are asked to load modules, that is the expected
-path, no?).
-
-I will put this in the compiler-attributes tree and get
-some time in linux-next, unless you want to pick it up!
-
- include/linux/module.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 8fa38d3e7538..c4e805e87628 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -129,13 +129,13 @@ extern void cleanup_module(void);
- #define module_init(initfn) \
- static inline initcall_t __maybe_unused __inittest(void) \
- { return initfn; } \
-- int init_module(void) __attribute__((alias(#initfn)));
-+ int init_module(void) __cold __attribute__((alias(#initfn)));
-
- /* This is only required if you want to be unloadable. */
- #define module_exit(exitfn) \
- static inline exitcall_t __maybe_unused __exittest(void) \
- { return exitfn; } \
-- void cleanup_module(void) __attribute__((alias(#exitfn)));
-+ void cleanup_module(void) __cold __attribute__((alias(#exitfn)));
-
- #endif
-
diff --git a/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch b/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch
deleted file mode 100644
index 2010603f4ad4..000000000000
--- a/lib-crc32.c-mark-crc32_le_base-__crc32c_le_base-aliases-as-__pure.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From patchwork Thu Jan 24 15:44:20 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
-X-Patchwork-Id: 1035252
-Return-Path: <SRS0=jJS3=QA=vger.kernel.org=linux-kernel-owner(a)kernel.org>
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- by smtp.lore.kernel.org (Postfix) with ESMTP id 95925C282C3
- for <linux-kernel(a)archiver.kernel.org>; Thu, 24 Jan 2019 15:44:28 +0000 (UTC)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.kernel.org (Postfix) with ESMTP id 6368521872
- for <linux-kernel(a)archiver.kernel.org>; Thu, 24 Jan 2019 15:44:28 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
- dkim=pass (2048-bit key) header.d=gmail.com header.i=(a)gmail.com
- header.b="DEOxuN9k"
-Received: (majordomo(a)vger.kernel.org) by vger.kernel.org via listexpand
- id S1728590AbfAXPo1 (ORCPT
- <rfc822;linux-kernel(a)archiver.kernel.org>);
- Thu, 24 Jan 2019 10:44:27 -0500
-Received: from mail-wm1-f68.google.com ([209.85.128.68]:37788 "EHLO
- mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1727649AbfAXPo0 (ORCPT
- <rfc822;linux-kernel(a)vger.kernel.org>);
- Thu, 24 Jan 2019 10:44:26 -0500
-Received: by mail-wm1-f68.google.com with SMTP id g67so3548002wmd.2
- for <linux-kernel(a)vger.kernel.org>;
- Thu, 24 Jan 2019 07:44:25 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=20161025;
- h=date:from:to:cc:subject:message-id:mime-version:content-disposition
- :user-agent;
- bh=JeyLhzrsCRzzO/4nbb0LJSQxILVpgC++VcQqugacalc=;
- b=DEOxuN9kV3A3qQ3ere0UjnfgT3DE1Gc4z/52Qty46F/mbpPja2OkXvtPJ15RK9/h4Z
- AG1fdkKf/GjCRaBidO9BLWwcoq0uiTV69J0KR0rF67QR9zxgGVEl8fu6s/ZmtKnnIdF4
- AysPfOHY+/MwlcB6UOzADtS69SDUYTsxDxOfHBj/FjnS7WmNetq8ae17VvRdpd/JEWtE
- M58OhgBYmckFYuVXQTEEhpm8w6TIefPA5S3r3KeUuXclMeqJ07pU1vJWK7tdTp7sIeAv
- xYgGq49/NBPkUl4l+LdwVBwp+o6pvUfh2w9zBQW67xZu6rn/j500BV8xdubxQqHTauSM
- oQPw==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version
- :content-disposition:user-agent;
- bh=JeyLhzrsCRzzO/4nbb0LJSQxILVpgC++VcQqugacalc=;
- b=twekOdboep908h8e5de5qIQIgDuUrOYeS/p8s5bh3AYpMD9r3CIJtanHSCWnFCsPIw
- /hesYDvbpVSiQTI1afBap2tw2ugq2aL2Sur2/9BhWE5So2HlVMlN5M6S8ccs6IK6Ldzh
- +wxWJnq7dnvwbpMLcT3mASpdlEUPTaVTA7AazIssYrIDY9ucJA4vfYUemvvTtKn2tovO
- lJjVDsOwv7/3P9XphLneTUXTI1ZD9soUX/qpt1m4n4BAme1tHfmbAL4cceRfMf7eFKhh
- t3iRpkh/6ZHMGw0moeXPkTB+WTDhA7MgsmQA/X6tmPfjfMQsEo+OKRUBtFuuVDY5wzSf
- eX7Q==
-X-Gm-Message-State: AJcUukcM8ZahlKLufK0H1V2XtT0GIN899FyU1V2PJM0+/GfK3XvzMW2n
- o0kPoin07YrKIK/Zh71qAxI=
-X-Google-Smtp-Source:
- ALg8bN7upuyKWCD/cTB9FAkdcEyU6dlTStUcg49cEAv640NugO83fRipoQ9X2YGpIogSFxA7BbHmeQ==
-X-Received: by 2002:a1c:bbd6:: with SMTP id l205mr2979576wmf.97.1548344665032;
- Thu, 24 Jan 2019 07:44:25 -0800 (PST)
-Received: from gmail.com (79.108.96.12.dyn.user.ono.com. [79.108.96.12])
- by smtp.gmail.com with ESMTPSA id
- k128sm80898610wmd.37.2019.01.24.07.44.23
- (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
- Thu, 24 Jan 2019 07:44:24 -0800 (PST)
-Date: Thu, 24 Jan 2019 16:44:20 +0100
-From: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
-To: Krzysztof Kozlowski <krzk(a)kernel.org>
-Cc: Laura Abbott <labbott(a)redhat.com>,
- Herbert Xu <herbert(a)gondor.apana.org.au>,
- Ard Biesheuvel <ard.biesheuvel(a)linaro.org>,
- Catalin Marinas <catalin.marinas(a)arm.com>,
- Martin Sebor <msebor(a)gcc.gnu.org>, linux-kernel(a)vger.kernel.org
-Subject: [PATCH] lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as
- __pure
-Message-ID: <20190124154420.GA11471(a)gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: elm/2
-Sender: linux-kernel-owner(a)vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel(a)vger.kernel.org
-
-The upcoming GCC 9 release extends the -Wmissing-attributes warnings
-(enabled by -Wall) to C and aliases: it warns when particular function
-attributes are missing in the aliases but not in their target.
-
-In particular, it triggers here because crc32_le_base/__crc32c_le_base
-aren't __pure while their target crc32_le/__crc32c_le are.
-
-These aliases are used by architectures as a fallback in accelerated
-versions of CRC32. See commit 9784d82db3eb ("lib/crc32: make core crc32()
-routines weak so they can be overridden").
-
-Therefore, being fallbacks, it is likely that even if the aliases
-were called from C, there wouldn't be any optimizations possible.
-Currently, the only user is arm64, which calls this from asm.
-
-Still, marking the aliases as __pure makes sense and is a good idea
-for documentation purposes and possible future optimizations,
-which also silences the warning.
-
-Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
----
-I am picking this up through the compiler-attributes tree
-and putting it into -next along with the other cleanup
-for -Wmissing-attributes (unless some other maintainer wants it).
-
- lib/crc32.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/crc32.c b/lib/crc32.c
-index 45b1d67a1767..4a20455d1f61 100644
---- a/lib/crc32.c
-+++ b/lib/crc32.c
-@@ -206,8 +206,8 @@ u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len)
- EXPORT_SYMBOL(crc32_le);
- EXPORT_SYMBOL(__crc32c_le);
-
--u32 crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le);
--u32 __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le);
-+u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le);
-+u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le);
-
- /*
- * This multiplies the polynomials x and y modulo the given modulus.
--
2.17.2
4 years, 2 months
[Test Day] Kernel 5.0 2019-03-12
by Sumantro Mukherjee
Hey All,
First of all, I would like to thank every one of you who help us by
participating in Test Days. We have the Kernel 5.0 Test Day coming up next
week. This is the Kernel version Fedora 30 will be shipping with out of the
box. This test day is of major importance as we would like to catch all
bugs and see if all the things are working as they should.
As always, you can find everything in the wiki[0] and drop by
#fedora-test-day over Freenode to ask any questions.
[0] https://fedoraproject.org/wiki/Test_Day:2019-03-12_Kernel_5.0_Test_Day
Thanks
//sumantro
Fedora QE
TRIED AND PERSONALLY TESTED, ERGO TRUSTED <https://redhat.com/trusted>
4 years, 2 months