Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

Pull arm64 support from Catalin Marinas:
 "Linux support for the 64-bit ARM architecture (AArch64)

  Features currently supported:
   - 39-bit address space for user and kernel (each)
   - 4KB and 64KB page configurations
   - Compat (32-bit) user applications (ARMv7, EABI only)
   - Flattened Device Tree (mandated for all AArch64 platforms)
   - ARM generic timers"

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)
  arm64: ptrace: remove obsolete ptrace request numbers from user headers
  arm64: Do not set the SMP/nAMP processor bit
  arm64: MAINTAINERS update
  arm64: Build infrastructure
  arm64: Miscellaneous header files
  arm64: Generic timers support
  arm64: Loadable modules
  arm64: Miscellaneous library functions
  arm64: Performance counters support
  arm64: Add support for /proc/sys/debug/exception-trace
  arm64: Debugging support
  arm64: Floating point and SIMD
  arm64: 32-bit (compat) applications support
  arm64: User access library functions
  arm64: Signal handling support
  arm64: VDSO support
  arm64: System calls handling
  arm64: ELF definitions
  arm64: SMP support
  arm64: DMA mapping API
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc fs/stat.c
Simple merge

diff --cc include/linux/elf.h
index f930b1a390ab5cb4ffc4dc1ac4a3900be8594166,1e935e4c6328c4b16524eb3bd3a9ee487f5b0a0e..0a05051a8924df5e2d1e55562c1d66698702a7db
--- 1/include/linux/elf.h
--- 2/include/linux/elf.h
+++ b/include/linux/elf.h
@@@ -387,8 -387,10 +387,11 @@@ typedef struct elf64_shdr 
  #define NT_S390_PREFIX        0x305           /* s390 prefix register */
  #define NT_S390_LAST_BREAK    0x306   /* s390 breaking event address */
  #define NT_S390_SYSTEM_CALL   0x307   /* s390 system call restart data */
 +#define NT_S390_TDB   0x308           /* s390 transaction diagnostic block */
  #define NT_ARM_VFP    0x400           /* ARM VFP/NEON registers */
+ #define NT_ARM_TLS    0x401           /* ARM TLS register */
+ #define NT_ARM_HW_BREAK       0x402           /* ARM hardware breakpoint registers */
+ #define NT_ARM_HW_WATCH       0x403           /* ARM hardware watchpoint registers */
  
  
  /* Note header in a PT_NOTE section */

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc tools/perf/perf.h
Simple merge