Re: linux-next: manual merge of the nvdimm tree with the tip tree

2018-08-18 Thread Stephen Rothwell
Hi all, On Tue, 26 Jun 2018 12:18:53 +1000 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:

Re: linux-next: manual merge of the nvdimm tree with the tip tree

2018-06-26 Thread Dan Williams
On Tue, Jun 26, 2018 at 3:21 AM, Thomas Gleixner wrote: > 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")

Re: linux-next: manual merge of the nvdimm tree with the tip tree

2018-06-26 Thread Thomas Gleixner
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/m