linux-next: manual merge of the vhost tree with the hexagon tree

linux-next: manual merge of the vhost tree with the hexagon tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/hexagon/Kconfig
index a35ec47,9059e39..0000000
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -24,7 -26,8 +24,8 @@@ config HEXAGO
  	select HAVE_ARCH_KGDB
  	select HAVE_ARCH_TRACEHOOK
  	select NO_IOPORT
 +	select STACKTRACE_SUPPORT
+ 	select GENERIC_IOMAP
 -	# mostly generic routines, with some accelerated ones
  	---help---
  	  Qualcomm Hexagon is a processor architecture designed for high
  	  performance and low power across a wide variety of applications.
@@@ -71,9 -74,15 +72,6 @@@ config GENERIC_CSU
  config GENERIC_IRQ_PROBE
  	def_bool y
  
- config GENERIC_IOMAP
- 	def_bool y
- 
 -#config ZONE_DMA
 -#	bool
 -#	default y
 -
 -config HAS_DMA
 -	bool
 -	select HAVE_DMA_ATTRS
 -	default y
 -
  config NEED_SG_DMA_LENGTH
  	def_bool y
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Richard Kuo]

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.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

Hi Richard,

On Wed, 30 Nov 2011 00:45:53 -0600 Richard Kuo <rkuo@codeaurora.org> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]