summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-06-04 18:22:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-06-04 18:24:19 +0200
commit31b649130cf547a67225eef670909b9857e942cf (patch)
treee258b0516eec15da1b4490315a162f172cca744a
parente7ecb81cd06dcbfc053dd563d22fea0ee382aad9 (diff)
parentdf15d2b71a4373c57da73a58848ef607d25611a1 (diff)
downloadkernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc30.tar.gz
kernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc30.tar.xz
kernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc30.zip
-rw-r--r--configs/fedora/debug/CONFIG_DEBUG_PI_LIST1
-rw-r--r--configs/fedora/generic/CONFIG_BACKLIGHT_LCD_SUPPORT1
-rw-r--r--configs/fedora/generic/CONFIG_CHARGER_LTC36511
-rw-r--r--configs/fedora/generic/CONFIG_CHASH_SELFTEST1
-rw-r--r--configs/fedora/generic/CONFIG_CHASH_STATS1
-rw-r--r--configs/fedora/generic/CONFIG_DEBUG_PI_LIST1
-rw-r--r--configs/fedora/generic/CONFIG_INET6_XFRM_MODE_BEET1
-rw-r--r--configs/fedora/generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION1
-rw-r--r--configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TRANSPORT1
-rw-r--r--configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TUNNEL1
-rw-r--r--configs/fedora/generic/CONFIG_INET_XFRM_MODE_BEET1
-rw-r--r--configs/fedora/generic/CONFIG_INET_XFRM_MODE_TRANSPORT1
-rw-r--r--configs/fedora/generic/CONFIG_INET_XFRM_MODE_TUNNEL1
-rw-r--r--configs/fedora/generic/CONFIG_MTD_NAND1
-rw-r--r--configs/fedora/generic/CONFIG_MTD_NAND_ECC_BCH1
-rw-r--r--configs/fedora/generic/CONFIG_MTK_MMC1
-rw-r--r--configs/fedora/generic/CONFIG_NET_DSA_LEGACY1
-rw-r--r--configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV41
-rw-r--r--configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV61
-rw-r--r--configs/fedora/generic/CONFIG_R8822BE1
-rw-r--r--configs/fedora/generic/CONFIG_TRACING_EVENTS_GPIO1
-rw-r--r--configs/fedora/generic/CONFIG_VIDEO_ZORAN1
-rw-r--r--configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC1
-rw-r--r--configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_11888731
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5420_MCPM1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_FCOE_FNIC (renamed from configs/fedora/generic/CONFIG_FCOE_FNIC)0
-rw-r--r--configs/fedora/generic/x86/CONFIG_SCSI_ISCI (renamed from configs/fedora/generic/CONFIG_SCSI_ISCI)0
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config27
-rw-r--r--kernel-aarch64.config27
-rw-r--r--kernel-armv7hl-debug.config28
-rw-r--r--kernel-armv7hl-lpae-debug.config28
-rw-r--r--kernel-armv7hl-lpae.config28
-rw-r--r--kernel-armv7hl.config28
-rw-r--r--kernel-i686-debug.config21
-rw-r--r--kernel-i686.config21
-rw-r--r--kernel-ppc64le-debug.config23
-rw-r--r--kernel-ppc64le.config23
-rw-r--r--kernel-s390x-debug.config23
-rw-r--r--kernel-s390x.config23
-rw-r--r--kernel-x86_64-debug.config21
-rw-r--r--kernel-x86_64.config21
-rw-r--r--kernel.spec16
-rw-r--r--net-vhost_net-fix-possible-infinite-loop.patch200
-rw-r--r--s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch105
-rw-r--r--sources1
49 files changed, 20 insertions, 674 deletions
diff --git a/configs/fedora/debug/CONFIG_DEBUG_PI_LIST b/configs/fedora/debug/CONFIG_DEBUG_PI_LIST
deleted file mode 100644
index 0a47f5b7e..000000000
--- a/configs/fedora/debug/CONFIG_DEBUG_PI_LIST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEBUG_PI_LIST=y
diff --git a/configs/fedora/generic/CONFIG_BACKLIGHT_LCD_SUPPORT b/configs/fedora/generic/CONFIG_BACKLIGHT_LCD_SUPPORT
deleted file mode 100644
index ac802ca1c..000000000
--- a/configs/fedora/generic/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/configs/fedora/generic/CONFIG_CHARGER_LTC3651 b/configs/fedora/generic/CONFIG_CHARGER_LTC3651
deleted file mode 100644
index a4243da74..000000000
--- a/configs/fedora/generic/CONFIG_CHARGER_LTC3651
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_LTC3651 is not set
diff --git a/configs/fedora/generic/CONFIG_CHASH_SELFTEST b/configs/fedora/generic/CONFIG_CHASH_SELFTEST
deleted file mode 100644
index d53ef14d0..000000000
--- a/configs/fedora/generic/CONFIG_CHASH_SELFTEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHASH_SELFTEST is not set
diff --git a/configs/fedora/generic/CONFIG_CHASH_STATS b/configs/fedora/generic/CONFIG_CHASH_STATS
deleted file mode 100644
index 26edbafe8..000000000
--- a/configs/fedora/generic/CONFIG_CHASH_STATS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHASH_STATS is not set
diff --git a/configs/fedora/generic/CONFIG_DEBUG_PI_LIST b/configs/fedora/generic/CONFIG_DEBUG_PI_LIST
deleted file mode 100644
index 47c8c9f67..000000000
--- a/configs/fedora/generic/CONFIG_DEBUG_PI_LIST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_PI_LIST is not set
diff --git a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_BEET b/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_BEET
deleted file mode 100644
index 1b7c922b8..000000000
--- a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_BEET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET6_XFRM_MODE_BEET=m
diff --git a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION b/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
deleted file mode 100644
index c74e6f237..000000000
--- a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
diff --git a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TRANSPORT b/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TRANSPORT
deleted file mode 100644
index b76eceaab..000000000
--- a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TRANSPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
diff --git a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TUNNEL b/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TUNNEL
deleted file mode 100644
index 794c8a962..000000000
--- a/configs/fedora/generic/CONFIG_INET6_XFRM_MODE_TUNNEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
diff --git a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_BEET b/configs/fedora/generic/CONFIG_INET_XFRM_MODE_BEET
deleted file mode 100644
index 1c221bad4..000000000
--- a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_BEET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET_XFRM_MODE_BEET=m
diff --git a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TRANSPORT b/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TRANSPORT
deleted file mode 100644
index 004ec87ba..000000000
--- a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TRANSPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
diff --git a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TUNNEL b/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TUNNEL
deleted file mode 100644
index 326c015e8..000000000
--- a/configs/fedora/generic/CONFIG_INET_XFRM_MODE_TUNNEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INET_XFRM_MODE_TUNNEL=m
diff --git a/configs/fedora/generic/CONFIG_MTD_NAND b/configs/fedora/generic/CONFIG_MTD_NAND
deleted file mode 100644
index 92a3e729b..000000000
--- a/configs/fedora/generic/CONFIG_MTD_NAND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTD_NAND is not set
diff --git a/configs/fedora/generic/CONFIG_MTD_NAND_ECC_BCH b/configs/fedora/generic/CONFIG_MTD_NAND_ECC_BCH
deleted file mode 100644
index fa4e88929..000000000
--- a/configs/fedora/generic/CONFIG_MTD_NAND_ECC_BCH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTD_NAND_ECC_BCH is not set
diff --git a/configs/fedora/generic/CONFIG_MTK_MMC b/configs/fedora/generic/CONFIG_MTK_MMC
deleted file mode 100644
index 88b51c8af..000000000
--- a/configs/fedora/generic/CONFIG_MTK_MMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTK_MMC is not set
diff --git a/configs/fedora/generic/CONFIG_NET_DSA_LEGACY b/configs/fedora/generic/CONFIG_NET_DSA_LEGACY
deleted file mode 100644
index 76080523a..000000000
--- a/configs/fedora/generic/CONFIG_NET_DSA_LEGACY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_DSA_LEGACY is not set
diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV4 b/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV4
deleted file mode 100644
index eb79509ae..000000000
--- a/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV6 b/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV6
deleted file mode 100644
index 0ccc52a0b..000000000
--- a/configs/fedora/generic/CONFIG_NFT_CHAIN_ROUTE_IPV6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
diff --git a/configs/fedora/generic/CONFIG_R8822BE b/configs/fedora/generic/CONFIG_R8822BE
deleted file mode 100644
index 2f7c08787..000000000
--- a/configs/fedora/generic/CONFIG_R8822BE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_R8822BE=m
diff --git a/configs/fedora/generic/CONFIG_TRACING_EVENTS_GPIO b/configs/fedora/generic/CONFIG_TRACING_EVENTS_GPIO
deleted file mode 100644
index c18054ee3..000000000
--- a/configs/fedora/generic/CONFIG_TRACING_EVENTS_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TRACING_EVENTS_GPIO is not set
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN b/configs/fedora/generic/CONFIG_VIDEO_ZORAN
deleted file mode 100644
index e6a8d5656..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_ZORAN is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC
deleted file mode 100644
index 3195253f1..000000000
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC b/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC
new file mode 100644
index 000000000..c1a96e3d8
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC
@@ -0,0 +1 @@
+# CONFIG_SCSI_BUSLOGIC is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1188873 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1188873
deleted file mode 100644
index 58d6d9945..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1188873
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM64_ERRATUM_1188873=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5420_MCPM b/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5420_MCPM
deleted file mode 100644
index 0f72ec362..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5420_MCPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXYNOS5420_MCPM=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND b/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND
deleted file mode 100644
index 2d7c71efd..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC b/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC
deleted file mode 100644
index 96cbf1c99..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_ECC_SMC=y
diff --git a/configs/fedora/generic/CONFIG_FCOE_FNIC b/configs/fedora/generic/x86/CONFIG_FCOE_FNIC
index 197c5e704..197c5e704 100644
--- a/configs/fedora/generic/CONFIG_FCOE_FNIC
+++ b/configs/fedora/generic/x86/CONFIG_FCOE_FNIC
diff --git a/configs/fedora/generic/CONFIG_SCSI_ISCI b/configs/fedora/generic/x86/CONFIG_SCSI_ISCI
index 9b9e4f77a..9b9e4f77a 100644
--- a/configs/fedora/generic/CONFIG_SCSI_ISCI
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_ISCI
diff --git a/gitrev b/gitrev
index b5bb446a6..6c288f164 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-bec7550cca106c3ccc061e3e625516af63054fe4
+788a024921c48985939f8241c1ff862a7374d8f9
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 526cf1fdb..0339c47fe 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -287,7 +287,6 @@ CONFIG_ARM64_CNP=y
CONFIG_ARM64_CRYPTO=y
CONFIG_ARM64_ERRATUM_1024718=y
CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1188873=y
CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1418040=y
CONFIG_ARM64_ERRATUM_1463225=y
@@ -509,7 +508,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -890,7 +888,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -902,8 +899,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1145,7 +1140,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
CONFIG_CRYPTO_DEV_QCE=m
@@ -1305,7 +1299,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
CONFIG_DEBUG_PER_CPU_MAPS=y
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1822,7 +1815,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
CONFIG_FB_XILINX=m
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2467,10 +2459,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2480,9 +2468,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3631,13 +3616,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
@@ -3675,7 +3658,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3760,7 +3742,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4121,8 +4102,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4806,7 +4785,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5227,7 +5205,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5256,7 +5234,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6478,7 +6455,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7081,7 +7057,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 796ed2549..84f63315f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -287,7 +287,6 @@ CONFIG_ARM64_CNP=y
CONFIG_ARM64_CRYPTO=y
CONFIG_ARM64_ERRATUM_1024718=y
CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1188873=y
CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1418040=y
CONFIG_ARM64_ERRATUM_1463225=y
@@ -509,7 +508,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -890,7 +888,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -902,8 +899,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1145,7 +1140,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
CONFIG_CRYPTO_DEV_QCE=m
@@ -1298,7 +1292,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1806,7 +1799,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
CONFIG_FB_XILINX=m
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2451,10 +2443,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2464,9 +2452,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3611,13 +3596,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
@@ -3655,7 +3638,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3740,7 +3722,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4101,8 +4082,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4785,7 +4764,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5206,7 +5184,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5235,7 +5213,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6456,7 +6433,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7059,7 +7035,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b19a8a2aa..5d6c6b1dd 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -509,7 +509,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_DA9052=m
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -891,7 +890,6 @@ CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_ISP1704=m
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -907,8 +905,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1132,7 +1128,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
CONFIG_CRYPTO_DEV_MXS_DCP=m
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_OMAP_AES=m
@@ -1297,7 +1292,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
CONFIG_DEBUG_PER_CPU_MAPS=y
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1776,7 +1770,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXYNOS5420_MCPM=y
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1866,7 +1859,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2501,10 +2493,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2514,9 +2502,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3718,15 +3703,12 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_NAND_ECC_SMC=y
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_GPMI_NAND=m
# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
@@ -3770,7 +3752,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3854,7 +3835,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4214,8 +4194,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4925,7 +4903,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5384,7 +5361,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5413,7 +5390,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6753,7 +6729,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7410,7 +7385,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 9c5ee1f3c..7f7b8578a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -495,7 +495,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -868,7 +867,6 @@ CONFIG_CHARGER_GPIO=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -881,8 +879,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1101,7 +1097,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_QCOM_RNG=m
@@ -1259,7 +1254,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
CONFIG_DEBUG_PER_CPU_MAPS=y
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1710,7 +1704,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXYNOS5420_MCPM=y
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1800,7 +1793,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2417,10 +2409,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2430,9 +2418,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3591,14 +3576,11 @@ CONFIG_MTD_NAND_DAVINCI=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_NAND_ECC_SMC=y
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
CONFIG_MTD_NAND_GPIO=m
# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
@@ -3641,7 +3623,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3725,7 +3706,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4083,8 +4063,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4710,7 +4688,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5138,7 +5115,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5167,7 +5144,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6420,7 +6396,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7039,7 +7014,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 71dfeee77..184baaccf 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -495,7 +495,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -868,7 +867,6 @@ CONFIG_CHARGER_GPIO=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -881,8 +879,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1101,7 +1097,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_QCOM_RNG=m
@@ -1252,7 +1247,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1703,7 +1697,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXYNOS5420_MCPM=y
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1785,7 +1778,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2402,10 +2394,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2415,9 +2403,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3572,14 +3557,11 @@ CONFIG_MTD_NAND_DAVINCI=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_NAND_ECC_SMC=y
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
CONFIG_MTD_NAND_GPIO=m
# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
@@ -3622,7 +3604,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3706,7 +3687,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4064,8 +4044,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4690,7 +4668,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5118,7 +5095,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5147,7 +5124,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6399,7 +6375,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7018,7 +6993,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index ec6274314..48c72e646 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -509,7 +509,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_DA9052=m
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -891,7 +890,6 @@ CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_ISP1704=m
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -907,8 +905,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1132,7 +1128,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
CONFIG_CRYPTO_DEV_MXS_DCP=m
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_OMAP_AES=m
@@ -1290,7 +1285,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1769,7 +1763,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXYNOS5420_MCPM=y
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1851,7 +1844,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_XILINX is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2486,10 +2478,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2499,9 +2487,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3699,15 +3684,12 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_NAND_ECC_SMC=y
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_GPMI_NAND=m
# CONFIG_MTD_NAND_HISI504 is not set
-CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
@@ -3751,7 +3733,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_MUX_ADG792A=m
@@ -3835,7 +3816,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -4195,8 +4175,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4905,7 +4883,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5364,7 +5341,7 @@ CONFIG_SCSI_ARCMSR=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5393,7 +5370,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -6732,7 +6708,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_FOUNDATIONS=y
@@ -7389,7 +7364,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 951d7fe7b..a126acbb1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -381,7 +381,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -735,7 +734,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -746,8 +744,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1082,7 +1078,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -2205,10 +2200,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2218,9 +2209,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3361,13 +3349,11 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3400,7 +3386,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_MTRR_SANITIZER=y
@@ -3480,7 +3465,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3840,8 +3824,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4386,7 +4368,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5904,7 +5885,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_KEYS=m
@@ -6431,7 +6411,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index ca5d6d629..09d5e7fbb 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -380,7 +380,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -734,7 +733,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -745,8 +743,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1074,7 +1070,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -2188,10 +2183,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2201,9 +2192,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3342,13 +3330,11 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3381,7 +3367,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_MTRR_SANITIZER=y
@@ -3461,7 +3446,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3821,8 +3805,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4366,7 +4348,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5883,7 +5864,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_KEYS=m
@@ -6410,7 +6390,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 59651d183..e67cdd2c3 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -320,7 +320,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -673,7 +672,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -684,8 +682,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1005,7 +1001,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
CONFIG_DEBUG_PER_CPU_MAPS=y
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1448,7 +1443,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -2014,10 +2008,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2027,9 +2017,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3095,13 +3082,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3135,7 +3120,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
CONFIG_MUX_ADG792A=m
# CONFIG_MUX_ADGS1408 is not set
@@ -3207,7 +3191,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3564,8 +3547,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4089,7 +4070,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -4482,7 +4462,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -5525,7 +5504,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6046,7 +6024,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7c35ca217..b73ff5943 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -319,7 +319,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -672,7 +671,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -683,8 +681,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -997,7 +993,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1431,7 +1426,6 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
CONFIG_FCOE=m
# CONFIG_FDDI is not set
CONFIG_FEALNX=m
@@ -1997,10 +1991,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2010,9 +2000,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3074,13 +3061,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3114,7 +3099,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
CONFIG_MUX_ADG792A=m
# CONFIG_MUX_ADGS1408 is not set
@@ -3186,7 +3170,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3543,8 +3526,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4067,7 +4048,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -4460,7 +4440,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -5502,7 +5481,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6023,7 +6001,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index be7f72b44..d1785be62 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -325,7 +325,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -680,7 +679,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -691,8 +689,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1014,7 +1010,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
CONFIG_DEBUG_PER_CPU_MAPS=y
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1450,7 +1445,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-CONFIG_FCOE_FNIC=m
# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
# CONFIG_FEALNX is not set
@@ -1994,10 +1988,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2007,9 +1997,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3069,13 +3056,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3107,7 +3092,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
CONFIG_MUX_ADG792A=m
# CONFIG_MUX_ADGS1408 is not set
@@ -3179,7 +3163,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3535,8 +3518,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4025,7 +4006,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -4431,7 +4411,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -5470,7 +5449,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_KEYS=m
@@ -5987,7 +5965,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1eb9e2e4a..37ddf0387 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -324,7 +324,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -679,7 +678,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -690,8 +688,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1006,7 +1002,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -1433,7 +1428,6 @@ CONFIG_FB_VESA=y
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
-CONFIG_FCOE_FNIC=m
# CONFIG_FCOE is not set
# CONFIG_FDDI is not set
# CONFIG_FEALNX is not set
@@ -1977,10 +1971,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -1990,9 +1980,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3048,13 +3035,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3086,7 +3071,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MULTIPLEXER=m
CONFIG_MUX_ADG792A=m
# CONFIG_MUX_ADGS1408 is not set
@@ -3158,7 +3142,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3514,8 +3497,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4003,7 +3984,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
# CONFIG_R8188EU is not set
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -4409,7 +4389,6 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
@@ -5447,7 +5426,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_TRUSTED_KEYS=m
@@ -5964,7 +5942,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 85307493f..e46ea93e5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -388,7 +388,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -743,7 +742,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -754,8 +752,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1121,7 +1117,6 @@ CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -2249,10 +2244,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2262,9 +2253,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_BNXT_RE=m
@@ -3409,13 +3397,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3447,7 +3433,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_MTRR_SANITIZER=y
@@ -3525,7 +3510,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3885,8 +3869,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4428,7 +4410,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5959,7 +5940,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6489,7 +6469,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 4e4a04070..86b533a10 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -387,7 +387,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
CONFIG_BACKLIGHT_LP855X=m
@@ -742,7 +741,6 @@ CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_LT3651=m
-# CONFIG_CHARGER_LTC3651 is not set
# CONFIG_CHARGER_MANAGER is not set
CONFIG_CHARGER_MAX77650=m
# CONFIG_CHARGER_MAX8903 is not set
@@ -753,8 +751,6 @@ CONFIG_CHARGER_UCS1002=m
CONFIG_CHARLCD_BL_FLASH=y
# CONFIG_CHARLCD_BL_OFF is not set
# CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_IPSEC_INLINE=y
CONFIG_CHELSIO_T1_1G=y
@@ -1113,7 +1109,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PI_LIST is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
CONFIG_DEBUG_RODATA_TEST=y
@@ -2232,10 +2227,6 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET_AH=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_DIAG=m
@@ -2245,9 +2236,6 @@ CONFIG_INET_IPCOMP=m
CONFIG_INET_RAW_DIAG=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET=y
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_BNXT_RE=m
@@ -3390,13 +3378,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_FSL_IFC is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -3428,7 +3414,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_MTRR_SANITIZER=y
@@ -3506,7 +3491,6 @@ CONFIG_NET_DEVLINK=y
CONFIG_NET_DROP_MONITOR=y
CONFIG_NET_DSA_BCM_SF2=m
# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
@@ -3866,8 +3850,6 @@ CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
CONFIG_NFT_COUNTER=m
@@ -4408,7 +4390,6 @@ CONFIG_R6040=m
CONFIG_R8169=m
CONFIG_R8188EU=m
CONFIG_R8712U=m
-CONFIG_R8822BE=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SAA7706H=m
@@ -5938,7 +5919,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6468,7 +6448,6 @@ CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/kernel.spec b/kernel.spec
index 711a177f6..b16645c3a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 3
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -589,11 +589,7 @@ Patch507: 0001-Drop-that-for-now.patch
# Submitted upstream at https://lkml.org/lkml/2019/4/23/89
Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch
-# CVE-2019-3900 rhbz 1698757 1702940
-Patch524: net-vhost_net-fix-possible-infinite-loop.patch
-
# build fix
-Patch526: s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
Patch527: v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch
@@ -1839,6 +1835,16 @@ fi
#
#
%changelog
+* Tue Jun 04 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc3.git1.1
+- Linux v5.2-rc3-24-g788a024921c4
+- Reenable debugging options.
+
+* Mon Jun 03 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc3.git0.1
+- Linux v5.2-rc3
+
+* Mon Jun 03 2019 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
* Fri May 31 2019 Peter Robinson <pbrobinson@fedoraproject.org> 5.2.0-0.rc2.git1.2
- Bump for ARMv7 fix
diff --git a/net-vhost_net-fix-possible-infinite-loop.patch b/net-vhost_net-fix-possible-infinite-loop.patch
deleted file mode 100644
index f45d84bb2..000000000
--- a/net-vhost_net-fix-possible-infinite-loop.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From patchwork Thu Apr 25 07:33:19 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Jason Wang <jasowang@redhat.com>
-X-Patchwork-Id: 10916185
-Return-Path: <kvm-owner@kernel.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4F501575
- for <patchwork-kvm@patchwork.kernel.org>;
- Thu, 25 Apr 2019 07:33:33 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D276828BD7
- for <patchwork-kvm@patchwork.kernel.org>;
- Thu, 25 Apr 2019 07:33:33 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id C64AC28BE1; Thu, 25 Apr 2019 07:33:33 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI,
- RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590B228BD7
- for <patchwork-kvm@patchwork.kernel.org>;
- Thu, 25 Apr 2019 07:33:33 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1726957AbfDYHd1 (ORCPT
- <rfc822;patchwork-kvm@patchwork.kernel.org>);
- Thu, 25 Apr 2019 03:33:27 -0400
-Received: from mx1.redhat.com ([209.132.183.28]:60130 "EHLO mx1.redhat.com"
- rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
- id S1726317AbfDYHd1 (ORCPT <rfc822;kvm@vger.kernel.org>);
- Thu, 25 Apr 2019 03:33:27 -0400
-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
- [10.5.11.22])
- (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by mx1.redhat.com (Postfix) with ESMTPS id C2BCE3002619;
- Thu, 25 Apr 2019 07:33:26 +0000 (UTC)
-Received: from hp-dl380pg8-02.lab.eng.pek2.redhat.com
- (hp-dl380pg8-02.lab.eng.pek2.redhat.com [10.73.8.12])
- by smtp.corp.redhat.com (Postfix) with ESMTP id 5DA021001DDB;
- Thu, 25 Apr 2019 07:33:21 +0000 (UTC)
-From: Jason Wang <jasowang@redhat.com>
-To: mst@redhat.com, jasowang@redhat.com, kvm@vger.kernel.org,
- virtualization@lists.linux-foundation.org, netdev@vger.kernel.org,
- linux-kernel@vger.kernel.org
-Cc: ppandit@redhat.com
-Subject: [PATCH net] vhost_net: fix possible infinite loop
-Date: Thu, 25 Apr 2019 03:33:19 -0400
-Message-Id: <1556177599-56248-1-git-send-email-jasowang@redhat.com>
-X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
-X-Greylist: Sender IP whitelisted,
- not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
- Thu, 25 Apr 2019 07:33:26 +0000 (UTC)
-Sender: kvm-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <kvm.vger.kernel.org>
-X-Mailing-List: kvm@vger.kernel.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-When the rx buffer is too small for a packet, we will discard the vq
-descriptor and retry it for the next packet:
-
-while ((sock_len = vhost_net_rx_peek_head_len(net, sock->sk,
- &busyloop_intr))) {
-...
- /* On overrun, truncate and discard */
- if (unlikely(headcount > UIO_MAXIOV)) {
- iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
- err = sock->ops->recvmsg(sock, &msg,
- 1, MSG_DONTWAIT | MSG_TRUNC);
- pr_debug("Discarded rx packet: len %zd\n", sock_len);
- continue;
- }
-...
-}
-
-This makes it possible to trigger a infinite while..continue loop
-through the co-opreation of two VMs like:
-
-1) Malicious VM1 allocate 1 byte rx buffer and try to slow down the
- vhost process as much as possible e.g using indirect descriptors or
- other.
-2) Malicious VM2 generate packets to VM1 as fast as possible
-
-Fixing this by checking against weight at the end of RX and TX
-loop. This also eliminate other similar cases when:
-
-- userspace is consuming the packets in the meanwhile
-- theoretical TOCTOU attack if guest moving avail index back and forth
- to hit the continue after vhost find guest just add new buffers
-
-This addresses CVE-2019-3900.
-
-Fixes: d8316f3991d20 ("vhost: fix total length when packets are too short")
-Fixes: 3a4d5c94e9593 ("vhost_net: a kernel-level virtio server")
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- drivers/vhost/net.c | 41 +++++++++++++++++++++--------------------
- 1 file changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
-index df51a35..fb46e6b 100644
---- a/drivers/vhost/net.c
-+++ b/drivers/vhost/net.c
-@@ -778,8 +778,9 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock)
- int err;
- int sent_pkts = 0;
- bool sock_can_batch = (sock->sk->sk_sndbuf == INT_MAX);
-+ bool next_round = false;
-
-- for (;;) {
-+ do {
- bool busyloop_intr = false;
-
- if (nvq->done_idx == VHOST_NET_BATCH)
-@@ -845,11 +846,10 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock)
- vq->heads[nvq->done_idx].id = cpu_to_vhost32(vq, head);
- vq->heads[nvq->done_idx].len = 0;
- ++nvq->done_idx;
-- if (vhost_exceeds_weight(++sent_pkts, total_len)) {
-- vhost_poll_queue(&vq->poll);
-- break;
-- }
-- }
-+ } while (!(next_round = vhost_exceeds_weight(++sent_pkts, total_len)));
-+
-+ if (next_round)
-+ vhost_poll_queue(&vq->poll);
-
- vhost_tx_batch(net, nvq, sock, &msg);
- }
-@@ -873,8 +873,9 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
- struct vhost_net_ubuf_ref *uninitialized_var(ubufs);
- bool zcopy_used;
- int sent_pkts = 0;
-+ bool next_round = false;
-
-- for (;;) {
-+ do {
- bool busyloop_intr;
-
- /* Release DMAs done buffers first */
-@@ -951,11 +952,10 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
- else
- vhost_zerocopy_signal_used(net, vq);
- vhost_net_tx_packet(net);
-- if (unlikely(vhost_exceeds_weight(++sent_pkts, total_len))) {
-- vhost_poll_queue(&vq->poll);
-- break;
-- }
-- }
-+ } while (!(next_round = vhost_exceeds_weight(++sent_pkts, total_len)));
-+
-+ if (next_round)
-+ vhost_poll_queue(&vq->poll);
- }
-
- /* Expects to be always run from workqueue - which acts as
-@@ -1134,6 +1134,7 @@ static void handle_rx(struct vhost_net *net)
- struct iov_iter fixup;
- __virtio16 num_buffers;
- int recv_pkts = 0;
-+ bool next_round = false;
-
- mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_RX);
- sock = vq->private_data;
-@@ -1153,8 +1154,11 @@ static void handle_rx(struct vhost_net *net)
- vq->log : NULL;
- mergeable = vhost_has_feature(vq, VIRTIO_NET_F_MRG_RXBUF);
-
-- while ((sock_len = vhost_net_rx_peek_head_len(net, sock->sk,
-- &busyloop_intr))) {
-+ do {
-+ sock_len = vhost_net_rx_peek_head_len(net, sock->sk,
-+ &busyloop_intr);
-+ if (!sock_len)
-+ break;
- sock_len += sock_hlen;
- vhost_len = sock_len + vhost_hlen;
- headcount = get_rx_bufs(vq, vq->heads + nvq->done_idx,
-@@ -1239,12 +1243,9 @@ static void handle_rx(struct vhost_net *net)
- vhost_log_write(vq, vq_log, log, vhost_len,
- vq->iov, in);
- total_len += vhost_len;
-- if (unlikely(vhost_exceeds_weight(++recv_pkts, total_len))) {
-- vhost_poll_queue(&vq->poll);
-- goto out;
-- }
-- }
-- if (unlikely(busyloop_intr))
-+ } while (!(next_round = vhost_exceeds_weight(++recv_pkts, total_len)));
-+
-+ if (unlikely(busyloop_intr || next_round))
- vhost_poll_queue(&vq->poll);
- else
- vhost_net_enable_vq(net, vq);
diff --git a/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch b/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
deleted file mode 100644
index ef479dbee..000000000
--- a/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From patchwork Fri May 17 06:54:24 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Masahiro Yamada <yamada.masahiro@socionext.com>
-X-Patchwork-Id: 1075092
-Return-Path: <SRS0=M1fl=TR=vger.kernel.org=linux-kernel-owner@kernel.org>
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC95C04AB4
- for <linux-kernel@archiver.kernel.org>; Fri, 17 May 2019 06:55:12 +0000 (UTC)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.kernel.org (Postfix) with ESMTP id 3103B20848
- for <linux-kernel@archiver.kernel.org>; Fri, 17 May 2019 06:55:12 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
- dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com
- header.b="Q2VtVae6"
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1728126AbfEQGzL (ORCPT
- <rfc822;linux-kernel@archiver.kernel.org>);
- Fri, 17 May 2019 02:55:11 -0400
-Received: from conuserg-12.nifty.com ([210.131.2.79]:40958 "EHLO
- conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1727694AbfEQGzK (ORCPT
- <rfc822;linux-kernel@vger.kernel.org>);
- Fri, 17 May 2019 02:55:10 -0400
-Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp
- [153.142.97.92]) (authenticated)
- by conuserg-12.nifty.com with ESMTP id x4H6sQI1006236;
- Fri, 17 May 2019 15:54:26 +0900
-DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x4H6sQI1006236
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;
- s=dec2015msa; t=1558076066;
- bh=/BYTJ4zxnc9ql4xZQk+WJLrlDFM4qCpFxkd8pJzLb9c=;
- h=From:To:Cc:Subject:Date:From;
- b=Q2VtVae6Ee0HybhaWXSMg69y6q1arF8Sf/3u/XHMZTCPOpMB44H54BKHkbXrOYYN4
- sTyqKSVgGlNw7oPey6yYOSC6lOjkiel9mhOBKa/MRcGpXQ1EeRKhiJD9ciFZUJU5lo
- qG5n3KT7Slc5xaDZohnfycTLEiaOSVGvd85a6BlWsNry0dKe4AR1DBIFR3kjMMSag7
- ZEesarqfo0ZgWtXj9pt5ZSerrlX1EaZCLvJ3hArzEcceGum0qQRT0+XWSGTEGlPjId
- aZrU4OYTFZusbiPR43kGBDWduFx1qFAPX8BlT63J0EzHwxFepnxOG46QCvqob91ugR
- QTZCX5d2BYNbA==
-X-Nifty-SrcIP: [153.142.97.92]
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-To: Martin Schwidefsky <schwidefsky@de.ibm.com>,
- Heiko Carstens <heiko.carstens@de.ibm.com>,
- linux-s390@vger.kernel.org
-Cc: Arnd Bergmann <arnd@arndb.de>, Laura Abbott <labbott@redhat.com>,
- Masahiro Yamada <yamada.masahiro@socionext.com>,
- linux-kernel@vger.kernel.org,
- Andrew Morton <akpm@linux-foundation.org>
-Subject: [PATCH] s390: mark __cpacf_check_opcode() and cpacf_query_func() as
- __always_inline
-Date: Fri, 17 May 2019 15:54:24 +0900
-Message-Id: <20190517065424.24453-1-yamada.masahiro@socionext.com>
-X-Mailer: git-send-email 2.17.1
-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-
-Commit e60fb8bf68d4 ("s390/cpacf: mark scpacf_query() as __always_inline")
-was not enough to make sure to meet the 'i' (immediate) constraint for the
-asm operands.
-
-With CONFIG_OPTIMIZE_INLINING enabled, Laura Abbott reported error
-with gcc 9.1.1:
-
- In file included from arch/s390/crypto/prng.c:29:
- ./arch/s390/include/asm/cpacf.h: In function 'cpacf_query_func':
- ./arch/s390/include/asm/cpacf.h:170:2: warning: asm operand 3 probably doesn't match constraints
- 170 | asm volatile(
- | ^~~
- ./arch/s390/include/asm/cpacf.h:170:2: error: impossible constraint in 'asm'
-
-Add more __always_inline to force inlining.
-
-Fixes: 9012d011660e ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
-Reported-by: Laura Abbott <labbott@redhat.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
-
- arch/s390/include/asm/cpacf.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h
-index f316de40e51b..19459dfb4295 100644
---- a/arch/s390/include/asm/cpacf.h
-+++ b/arch/s390/include/asm/cpacf.h
-@@ -177,7 +177,7 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
- : "cc");
- }
-
--static inline int __cpacf_check_opcode(unsigned int opcode)
-+static __always_inline int __cpacf_check_opcode(unsigned int opcode)
- {
- switch (opcode) {
- case CPACF_KMAC:
-@@ -217,7 +217,7 @@ static inline int cpacf_test_func(cpacf_mask_t *mask, unsigned int func)
- return (mask->bytes[func >> 3] & (0x80 >> (func & 7))) != 0;
- }
-
--static inline int cpacf_query_func(unsigned int opcode, unsigned int func)
-+static __always_inline int cpacf_query_func(unsigned int opcode, unsigned int func)
- {
- cpacf_mask_t mask;
-
diff --git a/sources b/sources
index 087b775c4..6e58a0626 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
SHA512 (patch-5.2-rc3.xz) = 0d412178769defc6f4da5bba057a0e4f1330b2d87fd08b8554598d8cd802c1edbc68d58acf5af1c2d4777609feb25aee1963d7154572ec4b2a30ca36b9d07adc
+SHA512 (patch-5.2-rc3-git1.xz) = ebedd563211cc20d7afe3919123580f92af21abaa1c49b5f8c96154bb68ebbec115b107977b7d613e4fb2db04c33b2be029e55730ce81e7dfe4a6707037d720d