| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1382454649-16442-1-git-send-email-treding@nvidia.com> Date: Tue, 22 Oct 2013 17:10:45 +0200 From: Thierry Reding <thierry.reding@...il.com> To: Eric Dumazet <edumazet@...gle.com>, Helge Deller <deller@....de>, David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>, Parisc List <linux-parisc@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the net-next tree 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-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists