diff for duplicates of <20181124022035.17519-8-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index cd0d566..53e3d0a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,12 +57,12 @@ index 00e45c80e574..352e3dc0b3d9 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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_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) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -91,12 +91,12 @@ index b9553f770346..d1752e3f1248 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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_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) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -125,12 +125,12 @@ index 37cdfe64bb27..0a45b668abd1 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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_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) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -159,12 +159,12 @@ index ca573641fc6c..dc8527cae5a7 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD -+#if __BITS_PER_LONG == 64 ++#if __BITS_PER_LONG = 64 +#define SO_TIMESTAMP SO_TIMESTAMP_OLD +#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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_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) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -240,13 +240,13 @@ index dc704e41203d..0b0fae6b57a9 100644 -#define SO_TIMESTAMP SO_TIMESTAMP_OLD -#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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 +#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_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) +#endif + #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -264,7 +264,7 @@ index e60036618205..7b485dfaa400 100644 return; } -+ if (type == SO_TIMESTAMP_NEW || type == SO_TIMESTAMPNS_NEW) ++ if (type = SO_TIMESTAMP_NEW || type = SO_TIMESTAMPNS_NEW) + sock_set_flag(sk, SOCK_TSTAMP_NEW); + else + sock_reset_flag(sk, SOCK_TSTAMP_NEW); @@ -401,7 +401,7 @@ index eeb4639adbe5..65571a6273c3 100644 valbool = val ? 1 : 0; -+ if (optname == SO_TIMESTAMP_NEW) ++ if (optname = SO_TIMESTAMP_NEW) + sock_set_flag(sk, SOCK_TSTAMP_NEW); + if (valbool) diff --git a/a/content_digest b/N1/content_digest index 556b146..5d5aeed 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181124022035.17519-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" "Subject\0[PATCH 7/8] socket: Add SO_TIMESTAMP[NS]_NEW\0" - "Date\0Fri, 23 Nov 2018 18:20:34 -0800\0" + "Date\0Sat, 24 Nov 2018 02:20:34 +0000\0" "To\0davem@davemloft.net" " linux-kernel@vger.kernel.org\0" "Cc\0netdev@vger.kernel.org" @@ -77,12 +77,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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" "+#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_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" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -111,12 +111,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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" "+#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_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" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -145,12 +145,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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" "+#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_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" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -179,12 +179,12 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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" "+#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_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" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -260,13 +260,13 @@ " \n" "-#define SO_TIMESTAMP SO_TIMESTAMP_OLD\n" "-#define SO_TIMESTAMPNS SO_TIMESTAMPNS_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" "+#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_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" "+#endif\n" "+\n" " #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD\n" @@ -284,7 +284,7 @@ " \t\treturn;\n" " \t}\n" " \n" - "+\tif (type == SO_TIMESTAMP_NEW || type == SO_TIMESTAMPNS_NEW)\n" + "+\tif (type = SO_TIMESTAMP_NEW || type = SO_TIMESTAMPNS_NEW)\n" "+\t\tsock_set_flag(sk, SOCK_TSTAMP_NEW);\n" "+\telse\n" "+\t\tsock_reset_flag(sk, SOCK_TSTAMP_NEW);\n" @@ -421,7 +421,7 @@ " \n" " \tvalbool = val ? 1 : 0;\n" " \n" - "+\tif (optname == SO_TIMESTAMP_NEW)\n" + "+\tif (optname = SO_TIMESTAMP_NEW)\n" "+\t\tsock_set_flag(sk, SOCK_TSTAMP_NEW);\n" "+\n" " \tif (valbool)\n" @@ -533,4 +533,4 @@ "-- \n" 2.17.1 -7d55e301f2a486ee49d7a447e229901e62bb86e671fad3e394162956ed6bbb7b +82a4bcbae5ea6c8161e9bb6a0a00b0c2e0ef57adb9a4f690a058b312ed70c301
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.