Subject: linux-next: manual merge of the userns tree with the y2038 tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 4 Oct 2018 16:11:07 +1000

Hi Eric,

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

  kernel/signal.c

between commit:

  49c39f8464a9 ("y2038: signal: Change rt_sigtimedwait to use __kernel_timespec")

from the y2038 tree and commit:

  ae7795bc6187 ("signal: Distinguish between kernel_siginfo and siginfo")

from the userns tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/signal.c
index 0ff8305a26eb,1c2dd117fee0..000000000000
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@@ -3081,8 -3131,8 +3131,8 @@@ int copy_siginfo_from_user32(struct ker
   *  @info: if non-null, the signal's siginfo is returned here
   *  @ts: upper bound on process time suspension
   */
- static int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
+ static int do_sigtimedwait(const sigset_t *which, kernel_siginfo_t *info,
 -		    const struct timespec *ts)
 +		    const struct timespec64 *ts)
  {
  	ktime_t *to = NULL, timeout = KTIME_MAX;
  	struct task_struct *tsk = current;
@@@ -3145,8 -3194,8 +3195,8 @@@ SYSCALL_DEFINE4(rt_sigtimedwait, const 
  		size_t, sigsetsize)
  {
  	sigset_t these;
 -	struct timespec ts;
 +	struct timespec64 ts;
- 	siginfo_t info;
+ 	kernel_siginfo_t info;
  	int ret;
  
  	/* XXX: Don't preclude handling different sized sigset_t's.  */
@@@ -3174,11 -3223,11 +3224,11 @@@
  #ifdef CONFIG_COMPAT
  COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese,
  		struct compat_siginfo __user *, uinfo,
 -		struct compat_timespec __user *, uts, compat_size_t, sigsetsize)
 +		struct old_timespec32 __user *, uts, compat_size_t, sigsetsize)
  {
  	sigset_t s;
 -	struct timespec t;
 +	struct timespec64 t;
- 	siginfo_t info;
+ 	kernel_siginfo_t info;
  	long ret;
  
  	if (sigsetsize != sizeof(sigset_t))