Merge branches 'uaccess.alpha', 'uaccess.arc', 'uaccess.arm', 'uaccess.arm64', 'uacce...

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/openrisc/include/asm/uaccess.h
index 140faa1,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,96fc425,d6e7483,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a,227af1a..a557a7c
--- 1/arch/openrisc/include/asm/uaccess.h
--- 2/arch/openrisc/include/asm/uaccess.h
--- 3/arch/openrisc/include/asm/uaccess.h
--- 4/arch/openrisc/include/asm/uaccess.h
--- 5/arch/openrisc/include/asm/uaccess.h
--- 6/arch/openrisc/include/asm/uaccess.h
--- 7/arch/openrisc/include/asm/uaccess.h
--- 8/arch/openrisc/include/asm/uaccess.h
--- 9/arch/openrisc/include/asm/uaccess.h
--- 10/arch/openrisc/include/asm/uaccess.h
--- 11/arch/openrisc/include/asm/uaccess.h
--- 12/arch/openrisc/include/asm/uaccess.h
--- 13/arch/openrisc/include/asm/uaccess.h
--- 14/arch/openrisc/include/asm/uaccess.h
--- 15/arch/openrisc/include/asm/uaccess.h
--- 16/arch/openrisc/include/asm/uaccess.h
--- 17/arch/openrisc/include/asm/uaccess.h
--- 18/arch/openrisc/include/asm/uaccess.h
--- 19/arch/openrisc/include/asm/uaccess.h
--- 20/arch/openrisc/include/asm/uaccess.h
--- 21/arch/openrisc/include/asm/uaccess.h
--- 22/arch/openrisc/include/asm/uaccess.h
--- 23/arch/openrisc/include/asm/uaccess.h
--- 24/arch/openrisc/include/asm/uaccess.h
--- 25/arch/openrisc/include/asm/uaccess.h
--- 26/arch/openrisc/include/asm/uaccess.h
--- 27/arch/openrisc/include/asm/uaccess.h
--- 28/arch/openrisc/include/asm/uaccess.h
--- 29/arch/openrisc/include/asm/uaccess.h
--- 30/arch/openrisc/include/asm/uaccess.h
--- 31/arch/openrisc/include/asm/uaccess.h
--- 32/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -25,11 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,7 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 +25,7 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
                                #include <linux/prefetch.h>
                                #include <linux/string.h>
                                #include <asm/page.h>
-                               
-                               #define VERIFY_READ     0
-                               #define VERIFY_WRITE    1
++++++++++++++++++++ +++++++++++#include <asm/extable.h>
                                
                                /*
                                 * The fs value determines whether argument validity checking should be

diff --cc fs/ocfs2/cluster/tcp.c
Simple merge

diff --cc net/rds/tcp.c
Simple merge