Re: [PATCH net] ipv6: mcast: Delay put pmc->idev in mld_del_delrec(): manual merge

[Yue Haibing <yuehaibing@huawei.com>]

On 2025/7/17 22:41, Matthieu Baerts wrote:
> Hi Yue, Paolo, Jakub,
> 
> On 14/07/2025 16:19, Yue Haibing wrote:
>> pmc->idev is still used in ip6_mc_clear_src(), so as mld_clear_delrec()
>> does, the reference should be put after ip6_mc_clear_src() return.
> 
> FYI, I got a small conflict when merging 'net' in 'net-next' in the
> MPTCP tree due to this patch applied in 'net':
> 
>   ae3264a25a46 ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
> 
> and this one from 'net-next':
> 
>   a8594c956cc9 ("ipv6: mcast: Avoid a duplicate pointer check in
> mld_del_delrec()")
> 
> ----- Generic Message -----
> The best is to avoid conflicts between 'net' and 'net-next' trees but if
> they cannot be avoided when preparing patches, a note about how to fix
> them is much appreciated.

Sorry for the inconvenience.
> 
> The conflict has been resolved on our side[1] and the resolution we
> suggest is attached to this email. Please report any issues linked to
> this conflict resolution as it might be used by others. If you worked on
> the mentioned patches, don't hesitate to ACK this conflict resolution.
> ---------------------------
> 
> Regarding this conflict, the patch from net has been applied at a
> slightly different place after the code refactoring from net-next.
> 

This resolution looks good to me.

> Rerere cache is available in [2].
> 
> [1] https://github.com/multipath-tcp/mptcp_net-next/commit/ec9d9e40de20
> [2] https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/fe71
> 
> Cheers,
> Matt