From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Oct 2012 00:18:53 +0000 (-0700)
Subject: Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.7-rc1~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d6ee36dfb2d40c72071f68173f67c728a0e19f3;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM update from Russell King:
 "This is the final round of stuff for ARM, left until the end of the
  merge window to reduce the number of conflicts.  This set contains the
  ARM part of David Howells UAPI changes, and a fix to the ordering of
  'select' statements in ARM Kconfig files (see the appropriate commit
  for why this happened - thanks to Andrew Morton for pointing out the
  problem.)

  I've left this as long as I dare for this window to avoid conflicts,
  and I regenerated the config patch yesterday, posting it to our
  mailing list for review and testing.  I have several acks which
  include successful test reports for it.

  However, today I notice we've got new conflicts with previously unseen
  code...  though that conflict should be trivial (it's my changes vs a
  one liner.)"

* 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate arch/arm/include/asm

Fix up fairly conflict in arch/arm/Kconfig (the select re-organization
vs recent addition of GENERIC_KERNEL_EXECVE)
---

3d6ee36dfb2d40c72071f68173f67c728a0e19f3
diff --cc arch/arm/Kconfig
index 431c375,1bc092e..261fdd0
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1,18 -1,23 +1,24 @@@
  config ARM
  	bool
  	default y
+ 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+ 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
  	select ARCH_HAVE_CUSTOM_GPIO_H
- 	select HAVE_AOUT
- 	select HAVE_DMA_API_DEBUG
- 	select HAVE_IDE if PCI || ISA || PCMCIA
- 	select HAVE_DMA_ATTRS
- 	select HAVE_DMA_CONTIGUOUS if MMU
- 	select HAVE_MEMBLOCK
- 	select RTC_LIB
- 	select SYS_SUPPORTS_APM_EMULATION
+ 	select ARCH_WANT_IPC_PARSE_VERSION
+ 	select CPU_PM if (SUSPEND || CPU_IDLE)
+ 	select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
  	select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
- 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- 	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ 	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ 	select GENERIC_IRQ_PROBE
+ 	select GENERIC_IRQ_SHOW
+ 	select GENERIC_KERNEL_THREAD
++	select GENERIC_KERNEL_EXECVE
+ 	select GENERIC_PCI_IOMAP
+ 	select GENERIC_SMP_IDLE_THREAD
+ 	select GENERIC_STRNCPY_FROM_USER
+ 	select GENERIC_STRNLEN_USER
+ 	select HARDIRQS_SW_RESEND
+ 	select HAVE_AOUT
  	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
  	select HAVE_ARCH_KGDB
  	select HAVE_ARCH_TRACEHOOK