On Thu, Oct 01, 2020 at 07:53:53PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/acpi/acpi_numa.h
>
> between commit:
>
> 4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")
>
> from the pm tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/acpi/acpi_numa.h
between commit:
4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")
from the pm tree and commit:
623347c1b949 ("x86/numa: cleanup configuration dependent command-line
On Mon, 28 Sep 2020 20:24:59 +1000
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/acpi/numa/hmat.c
>
> between commits:
>
> 01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables
> that are not
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/acpi/numa/hmat.c
between commits:
01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables
that are not SRAT")
4eb3723f18e9 ("ACPI: Rename acpi_map_pxm_to_online_node() to
On Thu 23-10-14 14:09:05, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
> commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM
> suspend") from the
On Thu 23-10-14 14:09:05, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
commit 5695be142e20 (OOM, PM: OOM killed task shouldn't escape PM
suspend) from the pm tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM
suspend") from the pm tree and commit e039ae202d34 ("OOM, PM: OOM
killed task
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
commit 5695be142e20 (OOM, PM: OOM killed task shouldn't escape PM
suspend) from the pm tree and commit e039ae202d34 (OOM, PM: OOM
killed task cannot
8 matches
Mail list logo