From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>,
Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <marc.zyngier@arm•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jason Wang <jasowang@redhat•com>
Subject: Re: linux-next: manual merge of the vhost tree with the kvm-arm tree
Date: Mon, 30 Mar 2020 16:57:01 +1100 [thread overview]
Message-ID: <20200330165701.4e1b8039@canb.auug.org.au> (raw)
In-Reply-To: <20200330165614.4973a4bc@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi all,
On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> arch/arm/kvm/Kconfig
>
> between commit:
>
> 541ad0150ca4 ("arm: Remove 32bit KVM host support")
>
> from the kvm-arm tree and commit:
>
> ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
>
> from the vhost tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
^^^^^^^^^
I just removed the file, of course.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-03-30 5:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 5:56 linux-next: manual merge of the vhost tree with the kvm-arm tree Stephen Rothwell
2020-03-30 5:57 ` Stephen Rothwell [this message]
2020-03-30 7:08 ` Jason Wang
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=20200330165701.4e1b8039@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=jasowang@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=mst@redhat$(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