diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2020-06-24 15:50:53 +0000 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2020-06-24 15:50:53 +0000 |
| commit | 70554ed388036aae08d1120067bb9b33d580c3f7 (patch) | |
| tree | 9419797efbe6e4205cce26bb8e8e9e26332c96b1 | |
| parent | 443401d7dfdf05efdf3578e760de218f58eb0755 (diff) | |
| parent | 7246bc217f294252d06c22eaf9110f7879599061 (diff) | |
| download | kernel_replicant_linux-70554ed388036aae08d1120067bb9b33d580c3f7.tar.gz kernel_replicant_linux-70554ed388036aae08d1120067bb9b33d580c3f7.tar.bz2 kernel_replicant_linux-70554ed388036aae08d1120067bb9b33d580c3f7.zip | |
Merge branch 'master' into 'master'
Enable VBOXSF_FS (Closes: #961516)
See merge request kernel-team/linux!245
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 942c82243e6e..b1718507afd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ linux (5.7.5-1) UNRELEASED; urgency=medium * [rt] Add new signing key for Tom Zanussi * Set ABI to 1 + [ Gianfranco Costamagna ] + * [x86] Enable VBOXSF_FS as a module (Closes: #961516) + -- Ben Hutchings <benh@debian.org> Sat, 16 May 2020 00:08:32 +0100 linux (5.7~rc5-1~exp1) experimental; urgency=medium diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 83273aa011d8..c2200378f738 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1891,6 +1891,11 @@ CONFIG_PROC_VMCORE=y CONFIG_PSTORE=y ## +## file: fs/vboxsf/Kconfig +## +CONFIG_VBOXSF_FS=m + +## ## file: init/Kconfig ## CONFIG_USELIB=y |