From: Richard Kuo <rkuo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the vhost tree with the hexagon tree
Date: Wed, 30 Nov 2011 00:45:53 -0600 [thread overview]
Message-ID: <20111130064553.GA2393@codeaurora.org> (raw)
In-Reply-To: <20111129142259.78d3e10678c8e9d8376d52aa@canb.auug.org.au>
On Tue, Nov 29, 2011 at 02:22:59PM +1100, Stephen Rothwell wrote:
> Hi Michael,
>
> Today's linux-next merge of the vhost tree got a conflict in
> arch/hexagon/Kconfig between commit 5237bae0d8c9 ("various Kconfig
> cleanup and old platform build code removal") from the hexagon tree and
> commit4673ca8eb369 ("lib: move GENERIC_IOMAP to lib/Kconfig") from the
> vhost tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> --
I was figuring this would happen. What would be the best way for me to
fix this? Maybe rebase my patches on top of the vhost tree?
Thanks,
Richard Kuo
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2011-11-30 6:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-29 3:22 linux-next: manual merge of the vhost tree with the hexagon tree Stephen Rothwell
2011-11-30 6:45 ` Richard Kuo [this message]
2011-11-30 9:50 ` 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=20111130064553.GA2393@codeaurora.org \
--to=rkuo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox