Re: linux-next: duplicate patches in the xen-tip tree

[Stephen Rothwell]

Hi Stephen,

On Wed, 26 Mar 2025 09:03:10 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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

Attachment: pgpxWDkhF2SUA.pgp
Description: OpenPGP digital signature