From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:31:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20131025~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d05ba4f02dc373ee88239f3f4f037d02cec6188a;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'

Conflicts:
	arch/h8300/include/uapi/asm/socket.h
	arch/parisc/include/uapi/asm/socket.h
---

d05ba4f02dc373ee88239f3f4f037d02cec6188a
diff --cc arch/parisc/include/uapi/asm/socket.h
index 9f2174f42e37,7c614d01f1fa..f33113a6141e
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@@ -75,4 -75,11 +75,6 @@@
  
  #define SO_BUSY_POLL		0x4027
  
+ #define SO_MAX_PACING_RATE	0x4048
+ 
 -/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we
 - * have to define SOCK_NONBLOCK to a different value here.
 - */
 -#define SOCK_NONBLOCK   0x40000000
 -
 -#endif /* _ASM_SOCKET_H */
 +#endif /* _UAPI_ASM_SOCKET_H */