| Message ID | 20190411140425.22573-3-seth.forshee@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | shiftfs fixes | expand |
On 2019-04-11 09:04:25, Seth Forshee wrote: > BugLink: https://bugs.launchpad.net/bugs/1824354 > > There is no reason shiftfs needs to be built-in. Change it to be > a module, and add the module to the generic inclusion list so > that shiftfs will be available in linux-virtual. > > Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Acked-by: Tyler Hicks <tyhicks@canonical.com> Tyler > --- > debian.master/config/config.common.ubuntu | 2 +- > debian.master/control.d/generic.inclusion-list | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 826d7a699c67..ce7aaaf01486 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -8461,7 +8461,7 @@ CONFIG_SGETMASK_SYSCALL=y > CONFIG_SGL_ALLOC=y > CONFIG_SG_POOL=y > CONFIG_SG_SPLIT=y > -CONFIG_SHIFT_FS=y > +CONFIG_SHIFT_FS=m > CONFIG_SHIFT_FS_POSIX_ACL=y > CONFIG_SHMEM=y > CONFIG_SH_ETH=m > diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list > index 02796200ff2c..a94e60b94276 100644 > --- a/debian.master/control.d/generic.inclusion-list > +++ b/debian.master/control.d/generic.inclusion-list > @@ -201,6 +201,7 @@ fs/nfsd/* > fs/nls/nls_cp437.ko > fs/nls/nls_iso8859-1.ko > fs/overlayfs/* > +fs/shiftfs.ko > fs/squashfs/* > fs/udf/* > fs/ufs/* > -- > 2.20.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Just update the annotations file accordingly when applying.
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 826d7a699c67..ce7aaaf01486 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8461,7 +8461,7 @@ CONFIG_SGETMASK_SYSCALL=y CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SG_SPLIT=y -CONFIG_SHIFT_FS=y +CONFIG_SHIFT_FS=m CONFIG_SHIFT_FS_POSIX_ACL=y CONFIG_SHMEM=y CONFIG_SH_ETH=m diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 02796200ff2c..a94e60b94276 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -201,6 +201,7 @@ fs/nfsd/* fs/nls/nls_cp437.ko fs/nls/nls_iso8859-1.ko fs/overlayfs/* +fs/shiftfs.ko fs/squashfs/* fs/udf/* fs/ufs/*
BugLink: https://bugs.launchpad.net/bugs/1824354 There is no reason shiftfs needs to be built-in. Change it to be a module, and add the module to the generic inclusion list so that shiftfs will be available in linux-virtual. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> --- debian.master/config/config.common.ubuntu | 2 +- debian.master/control.d/generic.inclusion-list | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)