From: Sean Christopherson <seanjc@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Christoph Schlameuss <schlameuss@linux.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm6390 tree
Date: Wed, 11 Sep 2024 07:39:14 -0700 [thread overview]
Message-ID: <ZuGrkqwbBt2V0dJL@google.com> (raw)
In-Reply-To: <20240911154328.0ad45c38@canb.auug.org.au>
On Wed, Sep 11, 2024, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> tools/testing/selftests/kvm/.gitignore
>
> between commit:
>
> 011901fc2224 ("selftests: kvm: s390: Add s390x ucontrol test suite with hpage test")
>
> from the kvm6390 tree and commit:
>
> 9d15171f39f0 ("KVM: selftests: Explicitly include committed one-off assets in .gitignore")
>
> from the kvm-x86 tree.
>
> I fixed it up (the latter includes the former) and can carry the fix as
Ya, I'll make sure to note this in my pull request to Paolo, but I don't think
there's anything else to be done at this time.
Thanks Stephen!
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
prev parent reply other threads:[~2024-09-11 14:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 5:43 linux-next: manual merge of the kvm-x86 tree with the kvm6390 tree Stephen Rothwell
2024-09-11 14:39 ` Sean Christopherson [this message]
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=ZuGrkqwbBt2V0dJL@google.com \
--to=seanjc@google.com \
--cc=borntraeger@de.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schlameuss@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.