Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 29 May 2014 19:08:00 +1000

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
kernel/kexec.c between commit 011e4b02f1da ("powerpc, kexec: Fix
"Processor X is stuck" issue during kexec from ST mode") from Linus'
tree and commit 51950fcb6d27 ("kernel/kexec.c: convert printk to
pr_foo()") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc kernel/kexec.c
index 28c57069ef68,bf0b929e7f94..000000000000
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@@ -1683,15 -1679,7 +1679,15 @@@ int kernel_kexec(void
  		kexec_in_progress = true;
  		kernel_restart_prepare(NULL);
  		migrate_to_reboot_cpu();
 +
 +		/*
 +		 * migrate_to_reboot_cpu() disables CPU hotplug assuming that
 +		 * no further code needs to use CPU hotplug (which is true in
 +		 * the reboot case). However, the kexec path depends on using
 +		 * CPU hotplug again; so re-enable it here.
 +		 */
 +		cpu_hotplug_enable();
- 		printk(KERN_EMERG "Starting new kernel\n");
+ 		pr_emerg("Starting new kernel\n");
  		machine_shutdown();
  	}