From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Cc: Christoffer Dall <cdall@cs.columbia.edu>,
Marc Zyngier <marc.zyngier@arm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
KVM <kvm@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the kbuild tree
Date: Mon, 25 Nov 2019 13:58:11 +1100 [thread overview]
Message-ID: <20191125135811.4a3d71da@canb.auug.org.au> (raw)
In-Reply-To: <20191118143842.2e7ad24d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
Hi all,
On Mon, 18 Nov 2019 14:38:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> include/Kbuild
>
> between commit:
>
> fcbb8461fd23 ("kbuild: remove header compile test")
>
> from the kbuild tree and commit:
>
> 55009c6ed2d2 ("KVM: arm/arm64: Factor out hypercall handling from PSCI code")
>
> from the kvm-arm tree.
>
> I fixed it up (I just removed the file) 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.
This is now a conflict between the kvm tree and the kbuild tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-11-25 2:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 3:38 linux-next: manual merge of the kvm-arm tree with the kbuild tree Stephen Rothwell
2019-11-25 2:58 ` Stephen Rothwell [this message]
2019-11-26 20:30 ` Stephen Rothwell
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=20191125135811.4a3d71da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cdall@cs.columbia.edu \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=yamada.masahiro@socionext.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).