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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  arch/x86/kernel/fpu/signal.c

between commit:

  4303543bac16 ("gup: Turn fault_in_pages_{readable,writeable} into fault_in_{readable,writeable}")

from the gfs2 tree and commits:

  fcfb7163329c ("x86/fpu/signal: Move xstate clearing out of copy_fpregs_to_sigframe()")
  a2a8fd9a3efd ("x86/fpu/signal: Change return code of restore_fpregs_from_user() to boolean")

from the tip tree.

I fixed it up (I used the latter version - 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 arch/x86/kernel/fpu/signal.c
index 164c96434704,37dbfed29d75..000000000000
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@@ -275,12 -283,12 +283,12 @@@ retry
  		fpregs_unlock();
  
  		/* Try to handle #PF, but anything else is fatal. */
- 		if (ret != -EFAULT)
- 			return -EINVAL;
+ 		if (ret != X86_TRAP_PF)
+ 			return false;
  
 -		if (!fault_in_pages_readable(buf, size))
 +		if (!fault_in_readable(buf, size))
  			goto retry;
- 		return -EFAULT;
+ 		return false;
  	}
  
  	/*

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