From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
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>
Subject: Re: linux-next: manual merge of the kspp tree with the tip tree
Date: Wed, 6 Nov 2019 10:28:33 +0300 [thread overview]
Message-ID: <20191106072833.GC2560@uranus.lan> (raw)
In-Reply-To: <20191106160331.016b2521@canb.auug.org.au>
On Wed, Nov 06, 2019 at 04:03:31PM +1100, Stephen Rothwell wrote:
> 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.
Since these macros are just the same the fix is fine. Thank you!
next prev parent reply other threads:[~2019-11-06 7:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 5:03 linux-next: manual merge of the kspp tree with the tip tree Stephen Rothwell
2019-11-06 7:28 ` Cyrill Gorcunov [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-06 7:49 Stephen Rothwell
2022-09-06 8:41 ` Marco Elver
2022-10-05 2:54 ` Stephen Rothwell
2018-10-08 5:44 Stephen Rothwell
2018-09-07 3:05 Stephen Rothwell
Reply instructions:
You may reply publicly 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=20191106072833.GC2560@uranus.lan \
--to=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=sfr@canb.auug.org.au \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).