Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 6 Nov 2019 16:03:31 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kees Cook <keescook@google.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>,
        Cyrill Gorcunov <gorcunov@gmail.com>
Subject: linux-next: manual merge of the kspp tree with the tip tree
Message-ID: <20191106160331.016b2521@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/PJf3dd9n9+QwGxmYo4m+6=U";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/PJf3dd9n9+QwGxmYo4m+6=U
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/x86/kernel/fpu/xstate.c

between commit:

  446e693ca30b ("x86/fpu: Use XFEATURE_FP/SSE enum values instead of hardco=
ded numbers")

from the tip tree and commit:

  ec2f877856e0 ("treewide: Use sizeof_member() macro")

from the kspp 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/fpu/xstate.c
index 319be936c348,023b0a28e13b..000000000000
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@@ -254,13 -254,10 +254,13 @@@ static void __init setup_xstate_feature
  	 * in the fixed offsets in the xsave area in either compacted form
  	 * or standard form.
  	 */
 -	xstate_offsets[0] =3D 0;
 -	xstate_sizes[0] =3D offsetof(struct fxregs_state, xmm_space);
 -	xstate_offsets[1] =3D xstate_sizes[0];
 -	xstate_sizes[1] =3D sizeof_member(struct fxregs_state, xmm_space);
 +	xstate_offsets[XFEATURE_FP]	=3D 0;
 +	xstate_sizes[XFEATURE_FP]	=3D offsetof(struct fxregs_state,
 +						   xmm_space);
 +
 +	xstate_offsets[XFEATURE_SSE]	=3D xstate_sizes[XFEATURE_FP];
- 	xstate_sizes[XFEATURE_SSE]	=3D FIELD_SIZEOF(struct fxregs_state,
- 						       xmm_space);
++	xstate_sizes[XFEATURE_SSE]	=3D sizeof_member(struct fxregs_state,
++							xmm_space);
 =20
  	for (i =3D FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
  		if (!xfeature_enabled(i))

--Sig_/PJf3dd9n9+QwGxmYo4m+6=U
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3CVCMACgkQAVBC80lX
0GxEEAf/a3/xA9E9jpoa6PZE9i9aEcfPCqHhoaVVPXXFUWwD584mg3tO/ala5wrd
SlwLlLN8JrofrAC7TJxjHk7jq6oEW8nT7Ulzb3L8Hjq20rDW4szJhDFZAQGs4cKW
aNp0aj8XSfb9VvoVWk8GSx/TYcL66+oeckJB+DWP7J0Kbvy8P5CbFU7se59aD/bC
OO+CBlBJuRFjALnYYHhaD8qZNLmXkJjZr43DQ4dzba8RyRJdE9YystEIgVvWuBOd
It9APqMIQJyHwntuKEF3YK/wbhIoS3GsC3HfKc9rBvT/GIeVA5QIy1+AXp+fn8CU
CzDsORCZAeV6x+m67YIVXeWWYtRUYA==
=cs12
-----END PGP SIGNATURE-----

--Sig_/PJf3dd9n9+QwGxmYo4m+6=U--