On Fri, Nov 8, 2019 at 10:15 PM Arnd Bergmann arnd@arndb.de wrote:
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index 28491dac074b..0cca19670fd2 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -37,9 +37,16 @@ struct sock_extended_err {
The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_*
communicate network timestamps by passing this struct in a cmsg with
recvmsg(). See Documentation/networking/timestamping.txt for details.
User space sees a timespec definition that matches either
__kernel_timespec or __kernel_old_timespec, in the kernel we
*/
require two structure definitions to provide both.
struct scm_timestamping { +#ifdef __KERNEL__
struct __kernel_old_timespec ts[3];
+#else struct timespec ts[3]; +#endif };
The kbuild bot pointed out that the way I sent this series, the use of __kernel_old_timespec causes a build failure, because I introduce this in a separate submission. I'm moving this patch over to the other series, and changing the subject to
y2038: socket: use __kernel_old_timespec instead of timespec
With the expectation of merging it along with the other core patches.
Arnd