Hi all,
On Tue, 2 Jul 2019 12:13:57 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv4/devinet.c
>
> between commit:
>
> 2e6054636816 ("ipv4: don't set IPv6 only flags to IPv4 addresses")
>
> from the net tree and commit:
>
> 2638eb8b50cf ("net: ipv4: provide __rcu annotation for ifa_list")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc net/ipv4/devinet.c
> index c5ebfa199794,137d1892395d..000000000000
> --- a/net/ipv4/devinet.c
> +++ b/net/ipv4/devinet.c
> @@@ -473,11 -482,10 +487,13 @@@ static int __inet_insert_ifa(struct in_
> ifa->ifa_flags &= ~IFA_F_SECONDARY;
> last_primary = &in_dev->ifa_list;
>
> + /* Don't set IPv6 only flags to IPv4 addresses */
> + ifa->ifa_flags &= ~IPV6ONLY_FLAGS;
> +
> - for (ifap = &in_dev->ifa_list; (ifa1 = *ifap) != NULL;
> - ifap = &ifa1->ifa_next) {
> + ifap = &in_dev->ifa_list;
> + ifa1 = rtnl_dereference(*ifap);
> +
> + while (ifa1) {
> if (!(ifa1->ifa_flags & IFA_F_SECONDARY) &&
> ifa->ifa_scope <= ifa1->ifa_scope)
> last_primary = &ifa1->ifa_next;I am still getting this conflict (the commit ids may have changed). Just a reminder in case you think Linus may need to know. -- Cheers, Stephen Rothwell
pgp8lRiYeHTZF.pgp
Description: OpenPGP digital signature
