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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 29 May 2014 19:08:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Srivatsa S. Bhat" <srivatsa.bhat@...ux.vnet.ibm.com>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Fabian Frederick <fabf@...net.be>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

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                    sfr@...b.auug.org.au

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();
  	}
  

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)