From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the rseq tree with Linus' tree
Date: Wed, 15 Nov 2017 09:07:12 +0100 [thread overview]
Message-ID: <20171115080712.tehklwmcvol7iiic@gmail.com> (raw)
In-Reply-To: <20171115153536.7fab87b7@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Mathieu,
>
> [I may regret adding the rseq tree ...]
>
> Today's linux-next merge of the rseq tree got a conflict in:
>
> arch/x86/entry/entry_64.S
>
> between commits:
>
> 9da78ba6b47b ("x86/entry/64: Remove the restore_c_regs_and_iret label")
> 26c4ef9c49d8 ("x86/entry/64: Split the IRET-to-user and IRET-to-kernel paths")
> e53178328c9b ("x86/entry/64: Shrink paranoid_exit_restore and make labels local")
>
> from Linus' tree and commit:
>
> 60a77bfd24d5 ("membarrier: x86: Provide core serializing command (v2)")
>
> from the rseq 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.
NAK!
There's absolutely no way such invasive x86 changes should be done outside the x86
tree and be merged into linux-next.
linux-next should be for the regular maintenance flow, for changes pushed by
maintainers and part of the regular maintenance process - not for work-in-progress
features that may or may not be merged upstream in that form ...
Thanks,
Ingo
next prev parent reply other threads:[~2017-11-15 8:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-15 4:35 linux-next: manual merge of the rseq tree with Linus' tree Stephen Rothwell
2017-11-15 8:07 ` Ingo Molnar [this message]
2017-11-15 14:48 ` Stephen Rothwell
2017-11-15 15:00 ` Mathieu Desnoyers
2017-11-15 15:22 ` Thomas Gleixner
2017-11-15 15:41 ` Mathieu Desnoyers
2017-11-15 16:04 ` Thomas Gleixner
2017-11-15 16:12 ` Mathieu Desnoyers
2017-11-15 16:30 ` Thomas Gleixner
2017-11-15 16:39 ` Mathieu Desnoyers
2017-11-16 15:21 ` Mathieu Desnoyers
2017-11-15 14:49 ` Mathieu Desnoyers
2017-11-15 4:35 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=20171115080712.tehklwmcvol7iiic@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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).