linux-next: manual merge of the tip tree with the net-next tree

Stephen Rothwell
2019-02-15T02:20:27Z

[-- Attachment #1: Type: text/plain, Size: 1899 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

include/uapi/linux/time.h

between commits:

bcb3fc3247e5 ("arch: sparc: Override struct __kernel_old_timeval")
ca5e9aba753e ("time: Add time_types.h")

from the net-next tree and commit:

c70a772fda11 ("y2038: remove struct definition redirects")

from the tip tree.

I fixed it up (I used the net-next tree version of this file and applied
the following patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Feb 2019 13:16:41 +1100
Subject: [PATCH] time: fix up for "y2038: remove struct definition redirects"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/uapi/linux/time_types.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/include/uapi/linux/time_types.h b/include/uapi/linux/time_types.h
index 459070c61d47..27bfc8fc6904 100644
--- a/include/uapi/linux/time_types.h
+++ b/include/uapi/linux/time_types.h
@@ -4,19 +4,15 @@

#include <linux/types.h>

-#ifndef __kernel_timespec
struct __kernel_timespec {
__kernel_time64_t tv_sec; /* seconds */
long long tv_nsec; /* nanoseconds */
};
-#endif

-#ifndef __kernel_itimerspec
struct __kernel_itimerspec {
struct __kernel_timespec it_interval; /* timer period */
struct __kernel_timespec it_value; /* timer expiration */
};
-#endif

/*
* legacy timeval structure, only embedded in structures that
--
2.20.1

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]