From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Juergen Gross <jgross@suse•com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <sstabellini@kernel•org>,
Boris Ostrovsky <boris.ostrovsky@oracle•com>,
Xen Devel <xen-devel@lists•xenproject.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the xen-tip tree
Date: Fri, 28 Mar 2025 15:19:42 +1100 [thread overview]
Message-ID: <20250328151942.4f7010c0@canb.auug.org.au> (raw)
In-Reply-To: <20250326090310.4f162838@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Stephen,
On Wed, 26 Mar 2025 09:03:10 +1100 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-03-28 4:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 22:03 linux-next: duplicate patches in the xen-tip tree Stephen Rothwell
2025-03-28 4:19 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-14 1:47 Stephen Rothwell
2023-02-14 11:22 ` Peter Zijlstra
2023-02-21 8:39 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250328151942.4f7010c0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=jgross@suse$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sstabellini@kernel$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox