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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <3539bd21-7a31-4e02-828a-e03c226f0f90@kernel.org>
Date: Wed, 7 May 2025 08:06:40 +0200
From: Jiri Slaby <jirislaby@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>
Cc: Mengyuan Lou <mengyuanlou@...-swift.com>,
 Networking <netdev@...r.kernel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree

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