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

Stephen Rothwell
2025-05-28T06:13:54Z

[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]

Hi all,

On Wed, 7 May 2025 12:49:00 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
>
> between commit:
>
> a9843689e2de ("net: txgbe: add sriov function support")
>
> from the net-next tree and commit:
>
> 567b0a520912 ("net: Switch to irq_domain_create_*()")
>
> from the tip 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/ethernet/wangxun/txgbe/txgbe_irq.c
> index 3b9e831cf0ef,f2c2bd257e39..000000000000
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
> @@@ -198,9 -183,9 +198,9 @@@ int txgbe_setup_misc_irq(struct txgbe *
> if (wx->mac.type == wx_mac_aml)
> goto skip_sp_irq;
>
> - txgbe->misc.nirqs = 1;
> + txgbe->misc.nirqs = TXGBE_IRQ_MAX;
> - txgbe->misc.domain = irq_domain_add_simple(NULL, txgbe->misc.nirqs, 0,
> - &txgbe_misc_irq_domain_ops, txgbe);
> + txgbe->misc.domain = irq_domain_create_simple(NULL, txgbe->misc.nirqs, 0,
> + &txgbe_misc_irq_domain_ops, txgbe);
> if (!txgbe->misc.domain)
> return -ENOMEM;
>

This is now a conflict between the net-next tree and Linus' tree/

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]