Merge tag 'for-3.16' of git://git.linaro.org/people/ard.biesheuvel/linux-arm into...

FPSIMD register bank context switching and crypto algorithms
optimisations for arm64 from Ard Biesheuvel.

* tag 'for-3.16' of git://git.linaro.org/people/ard.biesheuvel/linux-arm:
  arm64/crypto: AES-ECB/CBC/CTR/XTS using ARMv8 NEON and Crypto Extensions
  arm64: pull in <asm/simd.h> from asm-generic
  arm64/crypto: AES in CCM mode using ARMv8 Crypto Extensions
  arm64/crypto: AES using ARMv8 Crypto Extensions
  arm64/crypto: GHASH secure hash using ARMv8 Crypto Extensions
  arm64/crypto: SHA-224/SHA-256 using ARMv8 Crypto Extensions
  arm64/crypto: SHA-1 using ARMv8 Crypto Extensions
  arm64: add support for kernel mode NEON in interrupt context
  arm64: defer reloading a task's FPSIMD state to userland resume
  arm64: add abstractions for FPSIMD state manipulation
  asm-generic: allow generic unaligned access if the arch supports it

Conflicts:
	arch/arm64/include/asm/thread_info.h

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/thread_info.h
index 0a8b2a97a32ea133ac1c3deb3deda14b145d250b,4a1ca1cfb2f8ef9d3502299c699835854ff85356..9c086c63f91133ae2d512058ebeec081bf83d08e
--- 1/arch/arm64/include/asm/thread_info.h
--- 2/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@@ -103,10 -100,8 +103,11 @@@ static inline struct thread_info *curre
  #define TIF_SIGPENDING                0
  #define TIF_NEED_RESCHED      1
  #define TIF_NOTIFY_RESUME     2       /* callback before returning to user */
+ #define TIF_FOREIGN_FPSTATE   3       /* CPU's FP state is not current's */
  #define TIF_SYSCALL_TRACE     8
 +#define TIF_SYSCALL_AUDIT     9
 +#define TIF_SYSCALL_TRACEPOINT        10
 +#define TIF_SECCOMP           11
  #define TIF_POLLING_NRFLAG    16
  #define TIF_MEMDIE            18      /* is terminating due to OOM killer */
  #define TIF_FREEZE            19
@@@ -118,17 -113,11 +119,18 @@@
  #define _TIF_SIGPENDING               (1 << TIF_SIGPENDING)
  #define _TIF_NEED_RESCHED     (1 << TIF_NEED_RESCHED)
  #define _TIF_NOTIFY_RESUME    (1 << TIF_NOTIFY_RESUME)
+ #define _TIF_FOREIGN_FPSTATE  (1 << TIF_FOREIGN_FPSTATE)
 +#define _TIF_SYSCALL_TRACE    (1 << TIF_SYSCALL_TRACE)
 +#define _TIF_SYSCALL_AUDIT    (1 << TIF_SYSCALL_AUDIT)
 +#define _TIF_SYSCALL_TRACEPOINT       (1 << TIF_SYSCALL_TRACEPOINT)
 +#define _TIF_SECCOMP          (1 << TIF_SECCOMP)
  #define _TIF_32BIT            (1 << TIF_32BIT)
  
  #define _TIF_WORK_MASK                (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
-                                _TIF_NOTIFY_RESUME)
+                                _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
  
 +#define _TIF_SYSCALL_WORK     (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
 +                               _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
 +
  #endif /* __KERNEL__ */
  #endif /* __ASM_THREAD_INFO_H */

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/arm64/kernel/signal.c
Simple merge

diff --cc arch/arm64/kernel/signal32.c
Simple merge