Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
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
Date: Wed, 6 Nov 2019 16:03:31 +1100
Message-ID: <20191106160331.016b2521@canb.auug.org.au> (raw)

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

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 hardcoded 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.

-- 
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] = 0;
 -	xstate_sizes[0] = offsetof(struct fxregs_state, xmm_space);
 -	xstate_offsets[1] = xstate_sizes[0];
 -	xstate_sizes[1] = sizeof_member(struct fxregs_state, xmm_space);
 +	xstate_offsets[XFEATURE_FP]	= 0;
 +	xstate_sizes[XFEATURE_FP]	= offsetof(struct fxregs_state,
 +						   xmm_space);
 +
 +	xstate_offsets[XFEATURE_SSE]	= xstate_sizes[XFEATURE_FP];
- 	xstate_sizes[XFEATURE_SSE]	= FIELD_SIZEOF(struct fxregs_state,
- 						       xmm_space);
++	xstate_sizes[XFEATURE_SSE]	= sizeof_member(struct fxregs_state,
++							xmm_space);
  
  	for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
  		if (!xfeature_enabled(i))

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

             reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-06  5:03 Stephen Rothwell [this message]
2019-11-06  7:28 ` Cyrill Gorcunov
  -- strict thread matches above, loose matches on Subject: below --
2018-10-08  5:44 Stephen Rothwell
2018-09-07  3:05 Stephen Rothwell

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191106160331.016b2521@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=gorcunov@gmail.com \
    --cc=hpa@zytor.com \
    --cc=keescook@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=pankaj.laxminarayan.bharadiya@intel.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git