Merge branches 'uaccess.alpha', 'uaccess.arc', 'uaccess.arm', 'uaccess.arm64', 'uacce...
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 26 Apr 2017 16:06:59 +0000 (12:06 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 26 Apr 2017 16:06:59 +0000 (12:06 -0400)
1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31  32 
arch/arm64/Kconfig
arch/openrisc/include/asm/uaccess.h
fs/ocfs2/cluster/tcp.c
net/rds/tcp.c

Simple merge
index 140faa16685a2325f3a1b6cbf9cbb9c8e68fc913,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,96fc425271c2eebc8733025a7a9418c281e283d2,d6e7483b9d17b75add2df293bfc2c6d2bc051c4d,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76,227af1acb8bd71bf3a2e8e1aa8c041d738e3ff76..a557a7cd02324c1468fd6407b989614544f00d00
                                #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
Simple merge
diff --cc net/rds/tcp.c
Simple merge