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

Jiri Slaby
2025-05-07T06:06:44Z

On 07. 05. 25, 4:49, Stephen Rothwell wrote:
> Hi all,
>
> 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,

LGTM, thanks.

--
js
suse labs