On Thu, Oct 24, 2019 at 3:49 AM wrote:
>
> From: He Zhe
>
> Thess options have been remove from mainline kernel.
>
> CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION removed by
> 4c145dce2601 ("xfrm: make xfrm modes builtin")
>
> CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE removed by
> be6ec88f41ba ("selinux: Remove SECURITY_SELINUX_BOOTPARAM_VALUE")
>
thanks for the commit references .. they make it much easier for me to
quickly grab and merge changes like this.
Cheers,
Bruce
> Signed-off-by: He Zhe
> ---
> cgl/features/mip6/mip6.cfg | 1 -
> cgl/features/selinux/selinux-dev.cfg | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/cgl/features/mip6/mip6.cfg b/cgl/features/mip6/mip6.cfg
> index 09a11b8d..f9c344b6 100644
> --- a/cgl/features/mip6/mip6.cfg
> +++ b/cgl/features/mip6/mip6.cfg
> @@ -4,6 +4,5 @@ CONFIG_XFRM_MIGRATE=y
> CONFIG_NET_KEY=m
> CONFIG_NET_KEY_MIGRATE=y
> CONFIG_IPV6_MIP6=m
> -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
> CONFIG_IPV6_MULTIPLE_TABLES=y
> CONFIG_IPV6_SUBTREES=y
> diff --git a/cgl/features/selinux/selinux-dev.cfg
> b/cgl/features/selinux/selinux-dev.cfg
> index 913e5e13..4c77d989 100644
> --- a/cgl/features/selinux/selinux-dev.cfg
> +++ b/cgl/features/selinux/selinux-dev.cfg
> @@ -1,4 +1,3 @@
> # SPDX-License-Identifier: MIT
> CONFIG_SECURITY_SELINUX_BOOTPARAM=y
> -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
> CONFIG_SECURITY_SELINUX_DEVELOP=y
> --
> 2.17.1
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
--
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
