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:
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")
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
Hi all,
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
Hi all,
Today's linux-next merge of the nvdimm tree got a conflict in:
kernel/Makefile
between commit:
d7822b1e24f2 ("rseq: Introduce restartable sequences system call")
from the tip tree and commit:
5981690ddb8f ("memremap: split devm_memremap_pages() and memremap()
infrastructure")
Hi all,
Today's linux-next merge of the nvdimm tree got a conflict in:
arch/x86/mm/init_64.c
between commit:
91f606a8fa68 ("x86/mm: Replace compile-time checks for 5-level paging with
runtime-time checks")
from the tip tree and commit:
a7e6c7015bf3 ("x86, memremap: fix altmap accountin
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
drivers/nvdimm/pmem.c
between commit:
71389703839e ("mm, zone_device: Replace {get, put}_zone_device_page() with a
single reference to fix pmem crash")
from the tip tree and commit:
c1d6e828a35d ("pmem: add dax_oper
7 matches
Mail list logo
