diff for duplicates of <20190202153454.7121-13-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 0f2bfa8..cb6170b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,19 +2,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -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: davem@davemloft.net +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 | 12 ++++-- arch/mips/include/uapi/asm/socket.h | 11 +++++- diff --git a/a/content_digest b/N1/content_digest index 2bd604d..9a84971 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,43 @@ "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 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Subject\0[PATCH net-next v5 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" "Date\0Sat, 2 Feb 2019 07:34:54 -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" "Add new socket timeout options that are y2038 safe.\n" "\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: davem at davemloft.net\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: davem@davemloft.net\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 | 12 ++++--\n" " arch/mips/include/uapi/asm/socket.h | 11 +++++-\n" @@ -311,4 +327,4 @@ "-- \n" 2.17.1 -d09d5afea0df98040eab5bcc9c9fc2bd8a0a664c0e2cf0c28aa795e9c749990c +9f815cd7d56e13ec2e2a811077313fee9d1a622d981c7785a6390c761e44dae4
diff --git a/a/1.txt b/N2/1.txt index 0f2bfa8..cb6170b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,19 +2,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -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: davem@davemloft.net +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 | 12 ++++-- arch/mips/include/uapi/asm/socket.h | 11 +++++- diff --git a/a/content_digest b/N2/content_digest index 2bd604d..6c93f3f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,43 @@ "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 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Subject\0[PATCH net-next v5 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" "Date\0Sat, 2 Feb 2019 07:34:54 -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" "Add new socket timeout options that are y2038 safe.\n" "\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: davem at davemloft.net\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: davem@davemloft.net\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 | 12 ++++--\n" " arch/mips/include/uapi/asm/socket.h | 11 +++++-\n" @@ -311,4 +327,4 @@ "-- \n" 2.17.1 -d09d5afea0df98040eab5bcc9c9fc2bd8a0a664c0e2cf0c28aa795e9c749990c +43453145456673a714a76f030a686217c81c01e4b008d25ae699621a6ec487ca
diff --git a/a/1.txt b/N3/1.txt index 0f2bfa8..cd6e4c6 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -2,19 +2,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -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: davem@davemloft.net +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 | 12 ++++-- arch/mips/include/uapi/asm/socket.h | 11 +++++- @@ -40,7 +40,7 @@ index 9826d1db71d0..0d0fddb7e738 100644 -#define SO_SNDTIMEO SO_SNDTIMEO_OLD +#if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -48,12 +48,12 @@ index 9826d1db71d0..0d0fddb7e738 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -72,7 +72,7 @@ index 96cc0e907f12..eb9f33f8a8b3 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 #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -80,12 +80,12 @@ index 96cc0e907f12..eb9f33f8a8b3 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -104,19 +104,19 @@ index 046f0cd9cce4..16e428f03526 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 #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -136,7 +136,7 @@ index 342ffdc3b424..8c9f74a66b55 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 #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -144,12 +144,12 @@ index 342ffdc3b424..8c9f74a66b55 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -168,7 +168,7 @@ index c56b8b487c12..c8b430cb6dc4 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 #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD @@ -177,12 +177,12 @@ index c56b8b487c12..c8b430cb6dc4 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -201,7 +201,7 @@ index 27b40002b780..a8904ae40713 100644 + struct __kernel_sock_timeval tv; + int size; - if (timeo == MAX_SCHEDULE_TIMEOUT) { + if (timeo = MAX_SCHEDULE_TIMEOUT) { tv.tv_sec = 0; @@ -353,13 +354,23 @@ static int sock_get_timeout(long timeo, void *optval) return sizeof(tv32); @@ -249,7 +249,7 @@ index 27b40002b780..a8904ae40713 100644 return -EINVAL; @@ -394,8 +414,8 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen) *timeo_p = MAX_SCHEDULE_TIMEOUT; - if (tv.tv_sec == 0 && tv.tv_usec == 0) + if (tv.tv_sec = 0 && tv.tv_usec = 0) return 0; - if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1)) - *timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ); @@ -264,13 +264,13 @@ index 27b40002b780..a8904ae40713 100644 case SO_RCVTIMEO_OLD: - ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen); + case SO_RCVTIMEO_NEW: -+ ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname == SO_RCVTIMEO_OLD); ++ ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname = SO_RCVTIMEO_OLD); break; case SO_SNDTIMEO_OLD: - ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen); + case SO_SNDTIMEO_NEW: -+ ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname == SO_SNDTIMEO_OLD); ++ ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname = SO_SNDTIMEO_OLD); break; case SO_ATTACH_FILTER: @@ -290,14 +290,14 @@ index 27b40002b780..a8904ae40713 100644 - lv = sock_get_timeout(sk->sk_rcvtimeo, &v); + case SO_RCVTIMEO_OLD: + case SO_RCVTIMEO_NEW: -+ lv = sock_get_timeout(sk->sk_rcvtimeo, &v, SO_RCVTIMEO_OLD == optname); ++ lv = sock_get_timeout(sk->sk_rcvtimeo, &v, SO_RCVTIMEO_OLD = optname); break; - case SO_SNDTIMEO: - lv = sock_get_timeout(sk->sk_sndtimeo, &v); + case SO_SNDTIMEO_OLD: + case SO_SNDTIMEO_NEW: -+ lv = sock_get_timeout(sk->sk_sndtimeo, &v, SO_SNDTIMEO_OLD == optname); ++ lv = sock_get_timeout(sk->sk_sndtimeo, &v, SO_SNDTIMEO_OLD = optname); break; case SO_RCVLOWAT: diff --git a/a/content_digest b/N3/content_digest index 2bd604d..6976178 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,27 +1,43 @@ "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 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" - "Date\0Sat, 2 Feb 2019 07:34:54 -0800\0" - "To\0cluster-devel.redhat.com\0" + "Subject\0[PATCH net-next v5 12/12] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Date\0Sat, 02 Feb 2019 15:34:54 +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" "Add new socket timeout options that are y2038 safe.\n" "\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: davem at davemloft.net\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: davem@davemloft.net\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 | 12 ++++--\n" " arch/mips/include/uapi/asm/socket.h | 11 +++++-\n" @@ -47,7 +63,7 @@ "-#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" "+#if !defined(__KERNEL__)\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" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -55,12 +71,12 @@ "+#define SO_RCVTIMEO\t\tSO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO\t\tSO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -79,7 +95,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" " #define SO_TIMESTAMPING\t\tSO_TIMESTAMPING_OLD\n" @@ -87,12 +103,12 @@ "+#define SO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -111,19 +127,19 @@ " \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" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" "+#define SO_RCVTIMEO\t\tSO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO\t\tSO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -143,7 +159,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" " #define SO_TIMESTAMPING\t\tSO_TIMESTAMPING_OLD\n" @@ -151,12 +167,12 @@ "+#define SO_RCVTIMEO\t\tSO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO\t\tSO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -175,7 +191,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" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" @@ -184,12 +200,12 @@ "+#define SO_RCVTIMEO\t\tSO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO\t\tSO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -208,7 +224,7 @@ "+\tstruct __kernel_sock_timeval tv;\n" "+\tint size;\n" " \n" - " \tif (timeo == MAX_SCHEDULE_TIMEOUT) {\n" + " \tif (timeo = MAX_SCHEDULE_TIMEOUT) {\n" " \t\ttv.tv_sec = 0;\n" "@@ -353,13 +354,23 @@ static int sock_get_timeout(long timeo, void *optval)\n" " \t\treturn sizeof(tv32);\n" @@ -256,7 +272,7 @@ " \t\t\treturn -EINVAL;\n" "@@ -394,8 +414,8 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)\n" " \t*timeo_p = MAX_SCHEDULE_TIMEOUT;\n" - " \tif (tv.tv_sec == 0 && tv.tv_usec == 0)\n" + " \tif (tv.tv_sec = 0 && tv.tv_usec = 0)\n" " \t\treturn 0;\n" "-\tif (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1))\n" "-\t\t*timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ);\n" @@ -271,13 +287,13 @@ " \tcase SO_RCVTIMEO_OLD:\n" "-\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen);\n" "+\tcase SO_RCVTIMEO_NEW:\n" - "+\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname == SO_RCVTIMEO_OLD);\n" + "+\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname = SO_RCVTIMEO_OLD);\n" " \t\tbreak;\n" " \n" " \tcase SO_SNDTIMEO_OLD:\n" "-\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen);\n" "+\tcase SO_SNDTIMEO_NEW:\n" - "+\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname == SO_SNDTIMEO_OLD);\n" + "+\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname = SO_SNDTIMEO_OLD);\n" " \t\tbreak;\n" " \n" " \tcase SO_ATTACH_FILTER:\n" @@ -297,18 +313,18 @@ "-\t\tlv = sock_get_timeout(sk->sk_rcvtimeo, &v);\n" "+\tcase SO_RCVTIMEO_OLD:\n" "+\tcase SO_RCVTIMEO_NEW:\n" - "+\t\tlv = sock_get_timeout(sk->sk_rcvtimeo, &v, SO_RCVTIMEO_OLD == optname);\n" + "+\t\tlv = sock_get_timeout(sk->sk_rcvtimeo, &v, SO_RCVTIMEO_OLD = optname);\n" " \t\tbreak;\n" " \n" "-\tcase SO_SNDTIMEO:\n" "-\t\tlv = sock_get_timeout(sk->sk_sndtimeo, &v);\n" "+\tcase SO_SNDTIMEO_OLD:\n" "+\tcase SO_SNDTIMEO_NEW:\n" - "+\t\tlv = sock_get_timeout(sk->sk_sndtimeo, &v, SO_SNDTIMEO_OLD == optname);\n" + "+\t\tlv = sock_get_timeout(sk->sk_sndtimeo, &v, SO_SNDTIMEO_OLD = optname);\n" " \t\tbreak;\n" " \n" " \tcase SO_RCVLOWAT:\n" "-- \n" 2.17.1 -d09d5afea0df98040eab5bcc9c9fc2bd8a0a664c0e2cf0c28aa795e9c749990c +abc765f6aa8f09cb54c9b77edcf3b5692e62f9853620548d3067cffca0deef98
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.