merged Bruce
On Wed, Feb 27, 2019 at 2:41 AM <[email protected]> wrote: > > From: He Zhe <[email protected]> > > This fixes 01a28c32acb2 ("linux/nf.cfg: CONFIG_NF_CONNTRACK_IPV4 was replaced > by > CONFIG_NF_CONNTRACK") which duplicates a config fragment and causes the > following warning. > > Warning: Value of CONFIG_NF_CONNTRACK is defined multiple times within > fragment > tmp-glibc/work-shared/intel-x86-64/kernel-source/.kernel-meta/configs/v4.19/standard/intel-x86/nf.cfg: > CONFIG_NF_CONNTRACK=y > CONFIG_NF_CONNTRACK=y > > Signed-off-by: He Zhe <[email protected]> > --- > meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > index 1bf82ea..676a091 100644 > --- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg > @@ -2,7 +2,6 @@ CONFIG_NF_CONNTRACK=y > CONFIG_NF_NAT=m > CONFIG_NF_NAT_NEEDED=y > CONFIG_NF_NAT_PROTO_SCTP=m > -CONFIG_NF_CONNTRACK=y > CONFIG_NF_CONNTRACK_PROC_COMPAT=y > CONFIG_NF_NAT_IPV4=m > CONFIG_IP_NF_NAT=m > -- > 2.7.4 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
