linux-next: manual merge of the vfs tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/x86/kernel/fpu/xstate.c

between commit:

  5714ee50bb43 ("copy_xstate_to_kernel: Fix typo which caused GDB regression")

from Linus' tree and commit:

  c196049cc732 ("x86: switch to ->regset_get()")

from the vfs 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 arch/x86/kernel/fpu/xstate.c
index ad3a2b37927d,c80d4734c1f6..000000000000
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@@ -1065,17 -1048,16 +1048,16 @@@ void copy_xstate_to_kernel(struct membu
  	header.xfeatures &= xfeatures_mask_user();
  
  	if (header.xfeatures & XFEATURE_MASK_FP)
- 		copy_part(0, off_mxcsr,
- 			  &xsave->i387, &kbuf, &offset_start, &count);
+ 		copy_part(&to, &last, 0, off_mxcsr, &xsave->i387);
  	if (header.xfeatures & (XFEATURE_MASK_SSE | XFEATURE_MASK_YMM))
- 		copy_part(off_mxcsr, MXCSR_AND_FLAGS_SIZE,
- 			  &xsave->i387.mxcsr, &kbuf, &offset_start, &count);
+ 		copy_part(&to, &last, off_mxcsr,
+ 			  MXCSR_AND_FLAGS_SIZE, &xsave->i387.mxcsr);
  	if (header.xfeatures & XFEATURE_MASK_FP)
- 		copy_part(offsetof(struct fxregs_state, st_space), 128,
- 			  &xsave->i387.st_space, &kbuf, &offset_start, &count);
+ 		copy_part(&to, &last, offsetof(struct fxregs_state, st_space),
+ 			  128, &xsave->i387.st_space);
  	if (header.xfeatures & XFEATURE_MASK_SSE)
- 		copy_part(xstate_offsets[XFEATURE_SSE], 256,
- 			  &xsave->i387.xmm_space, &kbuf, &offset_start, &count);
 -		copy_part(&to, &last, xstate_offsets[XFEATURE_MASK_SSE],
++		copy_part(&to, &last, xstate_offsets[XFEATURE_SSE],
+ 			  256, &xsave->i387.xmm_space);
  	/*
  	 * Fill xsave->i387.sw_reserved value for ptrace frame:
  	 */

Attachment: pgpJtK7ampfhu.pgp
Description: OpenPGP digital signature