From: Thomas Gleixner <tglx@linutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dan Williams <dan.j.williams@intel.com>,
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>,
Borislav Petkov <bp@suse.de>
Subject: Re: linux-next: manual merge of the nvdimm tree with the tip tree
Date: Tue, 26 Jun 2018 12:21:04 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1806261217140.2204@nanos.tec.linutronix.de> (raw)
In-Reply-To: <20180626121853.0b4ce17c@canb.auug.org.au>
On Tue, 26 Jun 2018, Stephen Rothwell wrote:
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
> arch/x86/kernel/cpu/mcheck/mce.c
>
> between commit:
>
> d3d6923cd1ae ("x86/mce: Carve out the crashing_cpu check")
>
> from the tip tree and commit:
>
> f6785eac562b ("x86/memory_failure: Introduce {set,clear}_mce_nospec()")
>
> from the nvdimm tree.
Dan, we have rules how to deal with that stuff and there is no excuse for
you to collect random patches and apply them as you see fit. Stop this
please.
MCE/RAS patches have a well established and working route and if something
in your tree really depends on this, which I'm not seeing at all, then
there are well documented and established procedures to do that.
Thanks,
tglx
next prev parent reply other threads:[~2018-06-26 10:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 2:18 linux-next: manual merge of the nvdimm tree with the tip tree Stephen Rothwell
2018-06-26 10:21 ` Thomas Gleixner [this message]
2018-06-26 16:06 ` Dan Williams
2018-08-19 0:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2018-06-07 4:19 Stephen Rothwell
2018-03-15 8:06 Stephen Rothwell
2017-05-02 5:37 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=alpine.DEB.2.21.1806261217140.2204@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
/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).