Merge branch 'linus' into core/futexes

1 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index dc5086fe7736..20fc4bbfca42 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -190,7 +190,8 @@ struct ucred {
 #define AF_IUCV         32      /* IUCV sockets                 */
 #define AF_RXRPC        33      /* RxRPC sockets                */
 #define AF_ISDN         34      /* mISDN sockets                */
-#define AF_MAX          35      /* For now.. */
+#define AF_PHONET       35      /* Phonet sockets               */
+#define AF_MAX          36      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -227,6 +228,7 @@ struct ucred {
 #define PF_IUCV         AF_IUCV
 #define PF_RXRPC        AF_RXRPC
 #define PF_ISDN         AF_ISDN
+#define PF_PHONET       AF_PHONET
 #define PF_MAX          AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
@@ -295,6 +297,7 @@ struct ucred {
 #define SOL_RXRPC       272
 #define SOL_PPPOL2TP    273
 #define SOL_BLUETOOTH   274
+#define SOL_PNPIPE      275
 
 /* IPX options */
 #define IPX_TYPE        1