Merge branch 'linus' into x86/asm, to pick up recent fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 9b4c418bebd8..fd60eccb59a6 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -52,7 +52,7 @@ struct unix_sock {
         struct sock             sk;
         struct unix_address     *addr;
         struct path             path;
-        struct mutex            readlock;
+        struct mutex            iolock, bindlock;
         struct sock             *peer;
         struct list_head        link;
         atomic_long_t           inflight;