Merge branch 'quilt/hexagon'

Conflicts:
	arch/hexagon/Kconfig

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

diff --cc arch/hexagon/kernel/dma.c
Simple merge

diff --cc arch/hexagon/kernel/ptrace.c
index 32342de1a79c7ae6951fe819c56de0d53a3b999d,8fe03494aa664c543a645b58be8dea96dd11ed4a..96c3b2c4dbaded2a24bb0c62a13a5f669637c90d
--- 1/arch/hexagon/kernel/ptrace.c
--- 2/arch/hexagon/kernel/ptrace.c
+++ b/arch/hexagon/kernel/ptrace.c
@@@ -28,7 -28,9 +28,8 @@@
  #include <linux/ptrace.h>
  #include <linux/regset.h>
  #include <linux/user.h>
+ #include <linux/elf.h>
  
 -#include <asm/system.h>
  #include <asm/user.h>
  
  static int genregs_get(struct task_struct *target,

diff --cc arch/hexagon/kernel/vdso.c
Simple merge