diff for duplicates of <20190202153454.7121-12-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 681bc9a..acf8c56 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,18 +13,18 @@ to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- diff --git a/a/content_digest b/N1/content_digest index 26c47f4..f83d2ca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,24 @@ "ref\020190202153454.7121-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Subject\0[PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" "Date\0Sat, 2 Feb 2019 07:34:53 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -20,18 +36,18 @@ "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" "Acked-by: Willem de Bruijn <willemb@google.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -220,4 +236,4 @@ "-- \n" 2.17.1 -52b7a077f28eba5be74e26663303e26f188c3f23f7673a2634f74fe41de43467 +d508f9a5cd0f15a9bfa4825fab6620e5e8119c7e910c783bc3fdd5ae55a85e4b
diff --git a/a/1.txt b/N2/1.txt index 681bc9a..acf8c56 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,18 +13,18 @@ to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- diff --git a/a/content_digest b/N2/content_digest index 26c47f4..cafe257 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,24 @@ "ref\020190202153454.7121-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Subject\0[PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" "Date\0Sat, 2 Feb 2019 07:34:53 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0linux-arch@vger.kernel.org" + linux-parisc@vger.kernel.org + arnd@arndb.de + y2038@lists.linaro.org + netdev@vger.kernel.org + deller@gmx.de + linux-mips@vger.kernel.org + ralf@linux-mips.org + cluster-devel@redhat.com + ccaulfie@redhat.com + paulus@samba.org + linux-alpha@vger.kernel.org + sparclinux@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " rth@twiddle.net\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -20,18 +36,18 @@ "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" "Acked-by: Willem de Bruijn <willemb@google.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -220,4 +236,4 @@ "-- \n" 2.17.1 -52b7a077f28eba5be74e26663303e26f188c3f23f7673a2634f74fe41de43467 +27088431006e44f09a3a76939a166f2c5311f534ed3c7fccb89610487b3caf8b
diff --git a/a/1.txt b/N3/1.txt index 681bc9a..9cb4d16 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -13,18 +13,18 @@ to the architecture and time_t definition of libc. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 7 +++++-- arch/mips/include/uapi/asm/socket.h | 6 ++++-- @@ -58,7 +58,7 @@ index 934ea6268f1a..9826d1db71d0 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD + - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h @@ -82,7 +82,7 @@ index 110f9506d64f..96cc0e907f12 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h @@ -106,7 +106,7 @@ index bee2a9dde656..046f0cd9cce4 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h @@ -146,7 +146,7 @@ index 2b38dda51426..342ffdc3b424 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD + - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c @@ -167,7 +167,7 @@ index 76976d6e50f9..c98ad9777ad9 100644 + kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv, sizeof(tv)); - if (result == -EINPROGRESS) + if (result = -EINPROGRESS) diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h index 2713e0fa68ef..c56b8b487c12 100644 --- a/include/uapi/asm-generic/socket.h @@ -189,7 +189,7 @@ index 2713e0fa68ef..c56b8b487c12 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) + #if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__)) /* on 64-bit and x32, avoid the ?: operator */ #define SO_TIMESTAMP SO_TIMESTAMP_OLD diff --git a/net/core/sock.c b/net/core/sock.c diff --git a/a/content_digest b/N3/content_digest index 26c47f4..295ca5f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,24 @@ "ref\020190202153454.7121-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" - "Date\0Sat, 2 Feb 2019 07:34:53 -0800\0" - "To\0cluster-devel.redhat.com\0" + "Subject\0[PATCH net-next v5 11/12] socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes\0" + "Date\0Sat, 02 Feb 2019 15:34:53 +0000\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "SO_RCVTIMEO and SO_SNDTIMEO socket options use struct timeval\n" @@ -20,18 +36,18 @@ "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" "Acked-by: Willem de Bruijn <willemb@google.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 7 +++++--\n" " arch/mips/include/uapi/asm/socket.h | 6 ++++--\n" @@ -65,7 +81,7 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" "+\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h\n" @@ -89,7 +105,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h\n" @@ -113,7 +129,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h\n" @@ -153,7 +169,7 @@ "+#define SO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO SO_SNDTIMEO_OLD\n" "+\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" "diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c\n" @@ -174,7 +190,7 @@ "+\tkernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv,\n" " \t\t\t sizeof(tv));\n" " \n" - " \tif (result == -EINPROGRESS)\n" + " \tif (result = -EINPROGRESS)\n" "diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h\n" "index 2713e0fa68ef..c56b8b487c12 100644\n" "--- a/include/uapi/asm-generic/socket.h\n" @@ -196,7 +212,7 @@ " \n" "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))\n" + " #if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__))\n" " /* on 64-bit and x32, avoid the ?: operator */\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" "diff --git a/net/core/sock.c b/net/core/sock.c\n" @@ -220,4 +236,4 @@ "-- \n" 2.17.1 -52b7a077f28eba5be74e26663303e26f188c3f23f7673a2634f74fe41de43467 +bcfe9af70eb78bdb1cb53e7888d61a066c0c86ce88915c666ffd40d1ac942348
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.