| Message ID | 20190204153446.03ffb5e4@canb.auug.org.au |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: build failure after merge of the net-next tree | expand |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 4 Feb 2019 15:34:46 +1100 > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 4 Feb 2019 15:24:11 +1100 > Subject: [PATCH] socket: fix for Add SO_TIMESTAMP[NS]_NEW > > Fixes: 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW") > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Thanks for fixing this. Applied.
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h index 8c9f74a66b55..88fe4f978aca 100644 --- a/arch/sparc/include/uapi/asm/socket.h +++ b/arch/sparc/include/uapi/asm/socket.h @@ -108,7 +108,7 @@ #define SO_TIMESTAMPNS_OLD 0x0021 #define SO_TIMESTAMPING_OLD 0x0023 -#define SO_TIMESTAMP_NEW 0x0041 +#define SO_TIMESTAMP_NEW 0x0046 #define SO_TIMESTAMPNS_NEW 0x0042 #define SO_TIMESTAMPING_NEW 0x0043
Hi all, After merging the net-next tree, today's linux-next build (sparc64 defconfig) failed like this: /home/sfr/next/next/net/core/sock.c: In function 'sock_setsockopt': /home/sfr/next/next/net/core/sock.c:1146:2: error: duplicate case value case SO_BINDTOIFINDEX: ^~~~ /home/sfr/next/next/net/core/sock.c:891:2: note: previously used here case SO_TIMESTAMP_NEW: ^~~~ /home/sfr/next/next/net/core/sock.c: In function 'sock_getsockopt': /home/sfr/next/next/net/core/sock.c:1493:2: error: duplicate case value case SO_BINDTOIFINDEX: ^~~~ /home/sfr/next/next/net/core/sock.c:1293:2: note: previously used here case SO_TIMESTAMP_NEW: ^~~~ Caused by commit 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW") I applied the following fix patch (I just update the clashing id rather than update them all, but the latter may be better). From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 4 Feb 2019 15:24:11 +1100 Subject: [PATCH] socket: fix for Add SO_TIMESTAMP[NS]_NEW Fixes: 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/sparc/include/uapi/asm/socket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)