Merge remote-tracking branch 's390/features'

diff --cc include/linux/elf.h
index 1e935e4c6328c4b16524eb3bd3a9ee487f5b0a0e,f930b1a390ab5cb4ffc4dc1ac4a3900be8594166..0a05051a8924df5e2d1e55562c1d66698702a7db
--- 1/include/linux/elf.h
--- 2/include/linux/elf.h
+++ b/include/linux/elf.h
@@@ -387,10 -387,8 +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 */