Merge commit 'origin/master' into next

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

1 files changed, 6 insertions, 6 deletions

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index b8477414c5c8..4d3e48373e74 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -117,9 +117,9 @@
 struct flock {
         short   l_type;
         short   l_whence;
-        off_t   l_start;
-        off_t   l_len;
-        pid_t   l_pid;
+        __kernel_off_t  l_start;
+        __kernel_off_t  l_len;
+        __kernel_pid_t  l_pid;
         __ARCH_FLOCK_PAD
 };
 #endif
@@ -140,9 +140,9 @@ struct flock {
 struct flock64 {
         short  l_type;
         short  l_whence;
-        loff_t l_start;
-        loff_t l_len;
-        pid_t  l_pid;
+        __kernel_loff_t l_start;
+        __kernel_loff_t l_len;
+        __kernel_pid_t  l_pid;
         __ARCH_FLOCK64_PAD
 };
 #endif