From 0bc3955b5d4971b182095fa9cfb5ca7856945dcb Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 09:27:56 -0500 Subject: [PATCH] Revert "Enable VBOXSF_FS for x86" This reverts commit 2147ca93975deaf220619e9096e0b84d879febc9. Upstream removed the driver, hopefully it'll make it into 5.5. --- configs/fedora/generic/CONFIG_VBOXSF_FS | 1 - configs/fedora/generic/x86/CONFIG_VBOXSF_FS | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 16 files changed, 16 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_VBOXSF_FS delete mode 100644 configs/fedora/generic/x86/CONFIG_VBOXSF_FS diff --git a/configs/fedora/generic/CONFIG_VBOXSF_FS b/configs/fedora/generic/CONFIG_VBOXSF_FS deleted file mode 100644 index 7fb11ee4b..000000000 --- a/configs/fedora/generic/CONFIG_VBOXSF_FS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_VBOXSF_FS is not set diff --git a/configs/fedora/generic/x86/CONFIG_VBOXSF_FS b/configs/fedora/generic/x86/CONFIG_VBOXSF_FS deleted file mode 100644 index 9a112e599..000000000 --- a/configs/fedora/generic/x86/CONFIG_VBOXSF_FS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_VBOXSF_FS=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dd6e344db..d735470ae 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -7013,7 +7013,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 94cde7f9a..104f99094 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6991,7 +6991,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index b82dc04ed..0d6a11c76 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -7287,7 +7287,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 553636d03..b7dfc4800 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6933,7 +6933,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ea67ddec7..7177b848d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6912,7 +6912,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDSO=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index d8b4686ae..68df342ff 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -7266,7 +7266,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VDSO is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 3020a7e4e..d0c673c71 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6329,7 +6329,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 719bf2ab5..242861c29 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6308,7 +6308,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 0cf92f6bf..459d8630b 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5959,7 +5959,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index cee65c12a..13d8d9d1c 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5936,7 +5936,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index eddee89bb..9a2501c95 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5896,7 +5896,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index ec70e8384..237b2a434 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5873,7 +5873,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index f4774fc05..78e443a4c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6385,7 +6385,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 3c7a7c244..b5267ba41 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6364,7 +6364,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m # CONFIG_VEML6070 is not set