lkml.org 
[lkml]   [2013]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the net-next tree with the mips tree
Hi all,

Today's linux-next merge of the net-next tree got a conflict in
arch/mips/include/uapi/asm/socket.h between commit c4ff4842935c ("MIPS:
Whitespace cleanup") from the mips tree and commit 055dc21a1d1d
("soreuseport: infrastructure") from the net-next tree.

Also, that net-next tree patch can't be right (it removes an "#if 0" but
not the matching "#endif") - I fixed that as well.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/mips/include/uapi/asm/socket.h
index cc208f9,7e27236..0000000
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@@ -28,12 -28,11 +28,10 @@@
#define SO_LINGER 0x0080 /* Block on close of a reliable
socket to transmit pending data. */
#define SO_OOBINLINE 0x0100 /* Receive out-of-band data in-band. */
- #if 0
- To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */
- #endif
+ #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */
-#endif

#define SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */
-#define SO_STYLE SO_TYPE /* Synonym */
+#define SO_STYLE SO_TYPE /* Synonym */
#define SO_ERROR 0x1007 /* get error status and clear */
#define SO_SNDBUF 0x1001 /* Send buffer size. */
#define SO_RCVBUF 0x1002 /* Receive buffer. */
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-24 02:41    [W:0.020 / U:0.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site