Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 9a546ff853dc..2b9f74b0ffea 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -178,7 +178,8 @@ struct ucred {
 #define AF_CAIF         37      /* CAIF sockets                 */
 #define AF_ALG          38      /* Algorithm sockets            */
 #define AF_NFC          39      /* NFC sockets                  */
-#define AF_MAX          40      /* For now.. */
+#define AF_VSOCK        40      /* vSockets                     */
+#define AF_MAX          41      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -221,6 +222,7 @@ struct ucred {
 #define PF_CAIF         AF_CAIF
 #define PF_ALG          AF_ALG
 #define PF_NFC          AF_NFC
+#define PF_VSOCK        AF_VSOCK
 #define PF_MAX          AF_MAX
 
 /* Maximum queue length specifiable by listen.  */