Re: linux-next: manual merge of the vhost tree with the hexagontree

[Stephen Rothwell]

Hi Richard,

On Wed, 30 Nov 2011 00:45:53 -0600 Richard Kuo <rkuo@xxxxxxxxxxxxxx> wrote:
>
> On Tue, Nov 29, 2011 at 02:22:59PM +1100, Stephen Rothwell wrote:
> > 
> > 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?

No, just ignore it.  Linus will fix it up when he merges the trees into
his.  Its pretty trivial anyway.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature