From c9c28b91ca503d7e3ef4b0e666dc2c07f9202836 Mon Sep 17 00:00:00 2001 From: Sergey Ryazanov Date: Mon, 21 May 2018 12:12:35 +0300 Subject: [PATCH] kernel: enable EXPORTFS by default OVERLAY_FS config symbol selects EXPORTFS since 4.12 kernel, we have OVERLAY_FS enabled by default, so enable EXPORTFS in the generic config of 4.14 and remove this option from platform specific configs. Signed-off-by: Sergey Ryazanov (cherry picked from commit a08b0d0c3149060f1585ad3ea2ea3edfde71bce4) --- target/linux/apm821xx/config-4.14 | 1 - target/linux/archs38/config-4.14 | 1 - target/linux/ath79/config-4.14 | 1 - target/linux/bcm53xx/config-4.14 | 1 - target/linux/brcm47xx/config-4.14 | 1 - target/linux/brcm63xx/config-4.14 | 1 - target/linux/cns3xxx/config-4.14 | 1 - target/linux/gemini/config-4.14 | 1 - target/linux/generic/config-4.14 | 2 +- target/linux/imx6/config-4.14 | 1 - target/linux/ipq40xx/config-4.14 | 1 - target/linux/kirkwood/config-4.14 | 1 - target/linux/lantiq/config-4.14 | 1 - target/linux/mediatek/config-4.14 | 1 - target/linux/mvebu/config-4.14 | 1 - target/linux/octeon/config-4.14 | 1 - target/linux/octeontx/config-4.14 | 1 - target/linux/omap/config-4.14 | 1 - target/linux/pistachio/config-4.14 | 1 - target/linux/ramips/mt7620/config-4.14 | 1 - target/linux/ramips/mt76x8/config-4.14 | 1 - target/linux/ramips/rt288x/config-4.14 | 1 - target/linux/ramips/rt3883/config-4.14 | 1 - target/linux/sunxi/config-4.14 | 1 - target/linux/x86/config-4.14 | 1 - 25 files changed, 1 insertion(+), 25 deletions(-) diff --git a/target/linux/apm821xx/config-4.14 b/target/linux/apm821xx/config-4.14 index b8523d184945..06aa760a2e0f 100644 --- a/target/linux/apm821xx/config-4.14 +++ b/target/linux/apm821xx/config-4.14 @@ -98,7 +98,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y # CONFIG_EIGER is not set # CONFIG_EPAPR_BOOT is not set -CONFIG_EXPORTFS=y CONFIG_EXTRA_TARGETS="uImage" CONFIG_FIXED_PHY=y # CONFIG_FORCE_SMP is not set diff --git a/target/linux/archs38/config-4.14 b/target/linux/archs38/config-4.14 index 391ce80dc327..d7b62c56b49a 100644 --- a/target/linux/archs38/config-4.14 +++ b/target/linux/archs38/config-4.14 @@ -66,7 +66,6 @@ CONFIG_DWMAC_ANARION=y # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=y CONFIG_DW_APB_ICTL=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y # CONFIG_EZNPS_GIC is not set CONFIG_FIXED_PHY=y diff --git a/target/linux/ath79/config-4.14 b/target/linux/ath79/config-4.14 index 10838d4cdfa1..2dc70c2dca69 100644 --- a/target/linux/ath79/config-4.14 +++ b/target/linux/ath79/config-4.14 @@ -57,7 +57,6 @@ CONFIG_DMA_NONCOHERENT=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/bcm53xx/config-4.14 b/target/linux/bcm53xx/config-4.14 index db49a2de0fb1..5c22702a198a 100644 --- a/target/linux/bcm53xx/config-4.14 +++ b/target/linux/bcm53xx/config-4.14 @@ -131,7 +131,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y -CONFIG_EXPORTFS=y CONFIG_EXTCON=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/brcm47xx/config-4.14 b/target/linux/brcm47xx/config-4.14 index 6e164a726dba..47b7f6c94015 100644 --- a/target/linux/brcm47xx/config-4.14 +++ b/target/linux/brcm47xx/config-4.14 @@ -67,7 +67,6 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y # CONFIG_EARLY_PRINTK is not set -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/brcm63xx/config-4.14 b/target/linux/brcm63xx/config-4.14 index 20c3262dd11b..8394ead7d6fc 100644 --- a/target/linux/brcm63xx/config-4.14 +++ b/target/linux/brcm63xx/config-4.14 @@ -76,7 +76,6 @@ CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -CONFIG_EXPORTFS=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 index a1673b5f6651..7533430610fc 100644 --- a/target/linux/cns3xxx/config-4.14 +++ b/target/linux/cns3xxx/config-4.14 @@ -98,7 +98,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y CONFIG_ELF_CORE=y -CONFIG_EXPORTFS=y CONFIG_FIQ=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14 index 48f37dd13d2b..d3baf9f7652a 100644 --- a/target/linux/gemini/config-4.14 +++ b/target/linux/gemini/config-4.14 @@ -147,7 +147,6 @@ CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_EXPERT is not set -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_FARADAY_FTINTC010=y CONFIG_FHANDLE=y diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 032db368b397..e0cc1230671d 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -1272,7 +1272,7 @@ CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_EVENTFD=y CONFIG_EXPERT=y -# CONFIG_EXPORTFS is not set +CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set # CONFIG_EXT2_FS is not set # CONFIG_EXT2_FS_XATTR is not set diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14 index a08d74203178..8b0d07ca5687 100644 --- a/target/linux/imx6/config-4.14 +++ b/target/linux/imx6/config-4.14 @@ -172,7 +172,6 @@ CONFIG_E1000E=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_ENCRYPTED_KEYS=y -CONFIG_EXPORTFS=y CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_ENCRYPTION=y diff --git a/target/linux/ipq40xx/config-4.14 b/target/linux/ipq40xx/config-4.14 index 5f8283c932ce..2ab178b50f47 100644 --- a/target/linux/ipq40xx/config-4.14 +++ b/target/linux/ipq40xx/config-4.14 @@ -157,7 +157,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y CONFIG_ESSEDMA=y -CONFIG_EXPORTFS=y CONFIG_EXTCON=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/kirkwood/config-4.14 b/target/linux/kirkwood/config-4.14 index 8914ceb7640d..1abec78c4065 100644 --- a/target/linux/kirkwood/config-4.14 +++ b/target/linux/kirkwood/config-4.14 @@ -107,7 +107,6 @@ CONFIG_DTC=y # CONFIG_EARLY_PRINTK is not set CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/lantiq/config-4.14 b/target/linux/lantiq/config-4.14 index 07bc31444847..477d4edff277 100644 --- a/target/linux/lantiq/config-4.14 +++ b/target/linux/lantiq/config-4.14 @@ -50,7 +50,6 @@ CONFIG_DTC=y # CONFIG_DT_EASY50712 is not set CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/mediatek/config-4.14 b/target/linux/mediatek/config-4.14 index 893cf91e57b7..1b6e4616029d 100644 --- a/target/linux/mediatek/config-4.14 +++ b/target/linux/mediatek/config-4.14 @@ -165,7 +165,6 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_ELF_CORE=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FREEZER=y diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 index 80c4b84c8738..6d3edfeb45df 100644 --- a/target/linux/mvebu/config-4.14 +++ b/target/linux/mvebu/config-4.14 @@ -169,7 +169,6 @@ CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_EXTCON=y # CONFIG_F2FS_CHECK_FS is not set diff --git a/target/linux/octeon/config-4.14 b/target/linux/octeon/config-4.14 index 964d763274e2..fd80652e4b92 100644 --- a/target/linux/octeon/config-4.14 +++ b/target/linux/octeon/config-4.14 @@ -95,7 +95,6 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14 index 759b68746910..a8f6df34c8f7 100644 --- a/target/linux/octeontx/config-4.14 +++ b/target/linux/octeontx/config-4.14 @@ -199,7 +199,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_THUNDERX=y # CONFIG_EDAC_XGENE is not set CONFIG_EEPROM_AT24=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y # CONFIG_F2FS_CHECK_FS is not set diff --git a/target/linux/omap/config-4.14 b/target/linux/omap/config-4.14 index bfff0a76ab4d..d5f817156562 100644 --- a/target/linux/omap/config-4.14 +++ b/target/linux/omap/config-4.14 @@ -223,7 +223,6 @@ CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_93CX6=y -CONFIG_EXPORTFS=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_POSIX_ACL is not set diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14 index 92b115431448..a5abcb5d3635 100644 --- a/target/linux/pistachio/config-4.14 +++ b/target/linux/pistachio/config-4.14 @@ -86,7 +86,6 @@ CONFIG_DTC=y CONFIG_DWMAC_GENERIC=y CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_8250=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14 index 15536ec9de54..901245e09171 100644 --- a/target/linux/ramips/mt7620/config-4.14 +++ b/target/linux/ramips/mt7620/config-4.14 @@ -59,7 +59,6 @@ CONFIG_DTB_RT_NONE=y # CONFIG_DTB_VOCORE2 is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/ramips/mt76x8/config-4.14 b/target/linux/ramips/mt76x8/config-4.14 index 99aa79583782..6e4b22f3d63f 100644 --- a/target/linux/ramips/mt76x8/config-4.14 +++ b/target/linux/ramips/mt76x8/config-4.14 @@ -59,7 +59,6 @@ CONFIG_DTB_RT_NONE=y # CONFIG_DTB_VOCORE2 is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14 index 12555fe19557..feaf6ed34709 100644 --- a/target/linux/ramips/rt288x/config-4.14 +++ b/target/linux/ramips/rt288x/config-4.14 @@ -53,7 +53,6 @@ CONFIG_DMA_NONCOHERENT=y CONFIG_DTB_RT_NONE=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14 index 5db1c916547b..3ee36419fbae 100644 --- a/target/linux/ramips/rt3883/config-4.14 +++ b/target/linux/ramips/rt3883/config-4.14 @@ -56,7 +56,6 @@ CONFIG_DTB_RT_NONE=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y CONFIG_ETHERNET_PACKET_MANGLE=y -CONFIG_EXPORTFS=y CONFIG_FIXED_PHY=y CONFIG_FUTEX_PI=y CONFIG_GENERIC_ATOMIC64=y diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14 index 7248eed7ca6d..7ff3d1616247 100644 --- a/target/linux/sunxi/config-4.14 +++ b/target/linux/sunxi/config-4.14 @@ -164,7 +164,6 @@ CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y CONFIG_EXTCON=y # CONFIG_F2FS_CHECK_FS is not set diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index f09291f18104..d2de12902bc2 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -129,7 +129,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y # CONFIG_EDD is not set # CONFIG_EUROTECH_WDT is not set -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y -- 2.30.2