Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 10 insertions, 8 deletions

diff --git a/include/linux/dlm_netlink.h b/include/linux/dlm_netlink.h
index 19276332707a..647c8ef27227 100644
--- a/include/linux/dlm_netlink.h
+++ b/include/linux/dlm_netlink.h
@@ -9,6 +9,8 @@
 #ifndef _DLM_NETLINK_H
 #define _DLM_NETLINK_H
 
+#include <linux/types.h>
+
 enum {
         DLM_STATUS_WAITING = 1,
         DLM_STATUS_GRANTED = 2,
@@ -18,16 +20,16 @@ enum {
 #define DLM_LOCK_DATA_VERSION 1
 
 struct dlm_lock_data {
-        uint16_t version;
-        uint32_t lockspace_id;
+        __u16 version;
+        __u32 lockspace_id;
         int nodeid;
         int ownpid;
-        uint32_t id;
-        uint32_t remid;
-        uint64_t xid;
-        int8_t status;
-        int8_t grmode;
-        int8_t rqmode;
+        __u32 id;
+        __u32 remid;
+        __u64 xid;
+        __s8 status;
+        __s8 grmode;
+        __s8 rqmode;
         unsigned long timestamp;
         int resource_namelen;
         char resource_name[DLM_RESNAME_MAXLEN];