Re: linux-next: manual merge of the net-next tree with the net tree

[Matthieu Baerts]

Hi Mark,

On 23/07/2026 15:41, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/amt.c
> 
> between commit:
> 
>   3656a79f94c47 ("amt: re-read skb header pointers after every pull")
> 
> from the net tree and commit:
> 
>   586c4dcf28eb6 ("amt: no longer rely on RTNL in amt_fill_info()")
> 
> 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.
> 
> diff --cc drivers/net/amt.c
> index b733309b866ff,f8169c5512a59..0000000000000
> --- a/drivers/net/amt.c
> +++ b/drivers/net/amt.c
> @@@ -2811,7 -2775,8 +2814,8 @@@ drop
>   static int amt_rcv(struct sock *sk, struct sk_buff *skb)
>   {
>   	struct amt_dev *amt;
>  -	struct iphdr *iph;
>  +	__be32 saddr;
> + 	__be32 remote_ip;
Thank you for the resolution, it looks good to me, except these lines:
in the net subsystem, the local variables are declared following the
reversed Xmas tree order [1]. So I suppose the Net maintainers will
inverse these two lines when resolving this conflict.

[1]
https://docs.kernel.org/process/maintainer-netdev.html#local-variable-ordering-reverse-xmas-tree-rcs

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.