[SRU,D/C] UBUNTU: [Config] Update autofs4 path in inclusion list

Since a2225d931f75ddd3c39f4d0d195fad99dfd68671 (v4.18)

  autofs: remove left-over autofs4 stubs

there is no seperate fs/autofs4 path for the module anymore.
Replace it with fs/autofs so the module will again be included
in the main (not extra) modules file.

BugLink: https://bugs.launchpad.net/bugs/1824333

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/control.d/generic.inclusion-list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On 4/12/19 5:52 AM, Stefan Bader wrote:
> Since a2225d931f75ddd3c39f4d0d195fad99dfd68671 (v4.18)
> 
>   autofs: remove left-over autofs4 stubs
> 
> there is no seperate fs/autofs4 path for the module anymore.
> Replace it with fs/autofs so the module will again be included
> in the main (not extra) modules file.
> 
> BugLink: https://bugs.launchpad.net/bugs/1824333
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/control.d/generic.inclusion-list | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
> index 96cb2830eba4..e5b770975186 100644
> --- a/debian.master/control.d/generic.inclusion-list
> +++ b/debian.master/control.d/generic.inclusion-list
> @@ -178,7 +178,7 @@ drivers/xen/*
>  ! find sound/core -name oss -prune -o -name *.ko -print
>  fs/9p/*
>  fs/aufs/aufs.ko
> -fs/autofs4/autofs4.ko
> +fs/autofs/autofs4.ko
>  fs/binfmt_misc.ko
>  fs/btrfs/*
>  fs/cachefiles/cachefiles.ko
> 

Acked-by: Connor Kuehl <connor.kuehl@canonical.com>

Acked-By: You-Sheng Yang <vicamo.yang@canonical.com>

On 2019-04-12 14:52:59 , Stefan Bader wrote:
> Since a2225d931f75ddd3c39f4d0d195fad99dfd68671 (v4.18)
> 
>   autofs: remove left-over autofs4 stubs
> 
> there is no seperate fs/autofs4 path for the module anymore.
> Replace it with fs/autofs so the module will again be included
> in the main (not extra) modules file.
> 
> BugLink: https://bugs.launchpad.net/bugs/1824333
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/control.d/generic.inclusion-list | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
> index 96cb2830eba4..e5b770975186 100644
> --- a/debian.master/control.d/generic.inclusion-list
> +++ b/debian.master/control.d/generic.inclusion-list
> @@ -178,7 +178,7 @@ drivers/xen/*
>  ! find sound/core -name oss -prune -o -name *.ko -print
>  fs/9p/*
>  fs/aufs/aufs.ko
> -fs/autofs4/autofs4.ko
> +fs/autofs/autofs4.ko
>  fs/binfmt_misc.ko
>  fs/btrfs/*
>  fs/cachefiles/cachefiles.ko
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

On 4/12/19 2:52 PM, Stefan Bader wrote:
> Since a2225d931f75ddd3c39f4d0d195fad99dfd68671 (v4.18)
> 
>   autofs: remove left-over autofs4 stubs
> 
> there is no seperate fs/autofs4 path for the module anymore.
> Replace it with fs/autofs so the module will again be included
> in the main (not extra) modules file.
> 
> BugLink: https://bugs.launchpad.net/bugs/1824333
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.master/control.d/generic.inclusion-list | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
> index 96cb2830eba4..e5b770975186 100644
> --- a/debian.master/control.d/generic.inclusion-list
> +++ b/debian.master/control.d/generic.inclusion-list
> @@ -178,7 +178,7 @@ drivers/xen/*
>  ! find sound/core -name oss -prune -o -name *.ko -print
>  fs/9p/*
>  fs/aufs/aufs.ko
> -fs/autofs4/autofs4.ko
> +fs/autofs/autofs4.ko
>  fs/binfmt_misc.ko
>  fs/btrfs/*
>  fs/cachefiles/cachefiles.ko
> 

Applied to disco/master-next branch.

Thanks,
Kleber