Today's linux-next merge of the net-next tree got a conflict in arch/parisc/include/uapi/asm/socket.h caused by commits 62748f3 (net: introduce SO_MAX_PACING_RATE) and 1a0e62d (parisc: break out SOCK_NONBLOCK define to own asm header file). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/parisc/include/uapi/asm/socket.h index 9f2174f,7c614d0..f33113a --- 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
