linux-next: manual merge of the omap tree with the arm-soc tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

FIXME: Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the omap tree got a conflict in:

  arch/arm/mach-omap2/control.h

between commit:

  cbd33c61480b8 ("ARM: omap2: remove omap24xx support")

from the arm-soc tree and commit:

  9d458ad3ec155 ("ARM: OMAP2+: Replace __ASSEMBLY__ with __ASSEMBLER__")

from the omap tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/arm/mach-omap2/control.h
index 3ab1c6e6dde67,e4f4b16958084..0000000000000
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@@ -18,7 -18,11 +18,7 @@@
  
  #include "am33xx.h"
  
- #ifndef __ASSEMBLY__
+ #ifndef __ASSEMBLER__
 -#define OMAP242X_CTRL_REGADDR(reg)					\
 -		OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
 -#define OMAP243X_CTRL_REGADDR(reg)					\
 -		OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
  #define OMAP343X_CTRL_REGADDR(reg)					\
  		OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
  #define AM33XX_CTRL_REGADDR(reg)					\

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]