From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sean Christopherson <seanjc@google•com>,
Christian Borntraeger <borntraeger@de•ibm.com>,
Janosch Frank <frankja@linux•ibm.com>
Cc: 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: linux-next: manual merge of the kvm-x86 tree with the kvm6390 tree
Date: Wed, 11 Sep 2024 15:43:28 +1000 [thread overview]
Message-ID: <20240911154328.0ad45c38@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
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
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-11 5:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 5:43 Stephen Rothwell [this message]
2024-09-11 14:39 ` linux-next: manual merge of the kvm-x86 tree with the kvm6390 tree Sean Christopherson
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=20240911154328.0ad45c38@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=frankja@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schlameuss@linux$(echo .)ibm.com \
--cc=seanjc@google$(echo .)com \
/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