linux-kernel - Re: linux-next: duplicate patches in the xen-tip 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: <20250328151942.4f7010c0@canb.auug.org.au>
Date: Fri, 28 Mar 2025 15:19:42 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Juergen Gross <jgross@...e.com>, Konrad Rzeszutek Wilk
 <konrad.wilk@...cle.com>, Stefano Stabellini <sstabellini@...nel.org>,
 Boris Ostrovsky <boris.ostrovsky@...cle.com>, Xen Devel
 <xen-devel@...ts.xenproject.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the xen-tip tree

Hi Stephen,

On Wed, 26 Mar 2025 09:03:10 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   d9f2164238d8 ("PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag")
>   cae5129fccb1 ("PCI: vmd: Disable MSI remapping bypass under Xen")
> 
> These are commits
> 
>   c3164d2e0d18 ("PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag")
>   6c4d5aadf5df ("PCI: vmd: Disable MSI remapping bypass under Xen")
> 
> in Linus' tree.

This is now causing an unnecessary conflict.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped