linux-next: manual merge of the akpm tree with the pm tree

2018-12-03 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: fs/exec.c between commit: 67fe1224adc5 ("Revert "exec: make de_thread() freezable"") from the pm tree and patch: "fs/: remove caller signal_pending branch predictions" from the akpm tree. I fixed it up (see

linux-next: manual merge of the akpm tree with the pm tree

2018-12-03 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: fs/exec.c between commit: 67fe1224adc5 ("Revert "exec: make de_thread() freezable"") from the pm tree and patch: "fs/: remove caller signal_pending branch predictions" from the akpm tree. I fixed it up (see

linux-next: manual merge of the akpm tree with the pm tree

2012-11-04 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/acpi/acpi_memhotplug.c between commits 85fcb3758c10 ("ACPI / memory-hotplug: introduce a mutex lock to protect the list in acpi_memory_device") and d0fbb400b6f3 ("ACPI / memory-hotplug: add memory offline code to

linux-next: manual merge of the akpm tree with the pm tree

2012-11-04 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/acpi/acpi_memhotplug.c between commits 85fcb3758c10 (ACPI / memory-hotplug: introduce a mutex lock to protect the list in acpi_memory_device) and d0fbb400b6f3 (ACPI / memory-hotplug: add memory offline code to