From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>,
Masahiro Yamada <yamada.masahiro@socionext•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Nicolas Dichtel <nicolas.dichtel@6wind•com>
Subject: Re: linux-next: manual merge of the vhost tree with the kbuild tree
Date: Tue, 28 Mar 2017 15:00:58 +1100 [thread overview]
Message-ID: <20170328150058.394e4c5a@canb.auug.org.au> (raw)
In-Reply-To: <20170328145723.6345493c@canb.auug.org.au>
Hi Michael,
On Tue, 28 Mar 2017 14:57:23 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> include/uapi/linux/Kbuild
>
> between commit:
>
> 65017bab8a9e ("uapi: export all headers under uapi directories")
>
> from the kbuild tree and commit:
>
> 80363894995b ("virtio_mmio: expose header to userspace")
>
> from the vhost tree.
In fact, the vhost tree should be cleaned up as that patch has been
committed to Linus's tree as a different commit.
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2017-03-28 4:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 3:57 linux-next: manual merge of the vhost tree with the kbuild tree Stephen Rothwell
2017-03-28 4:00 ` Stephen Rothwell [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=20170328150058.394e4c5a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=nicolas.dichtel@6wind$(echo .)com \
--cc=yamada.masahiro@socionext$(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