Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.

1 files changed, 3 insertions, 0 deletions

diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index ef6103bf1f9b..71e1d0ed92f7 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -391,10 +391,13 @@ typedef struct elf64_shdr {
 #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_S390_VXRS_LOW        0x309   /* s390 vector registers 0-15 upper half */
+#define NT_S390_VXRS_HIGH       0x30a   /* s390 vector registers 16-31 */
 #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 */
+#define NT_ARM_SYSTEM_CALL      0x404   /* ARM system call number */
 #define NT_METAG_CBUF   0x500           /* Metag catch buffer registers */
 #define NT_METAG_RPIPE  0x501           /* Metag read pipeline state */
 #define NT_METAG_TLS    0x502           /* Metag TLS pointer */