linux-next: manual merge of the akpm-current tree with the livepatching tree

From: Stephen Rothwell
Date: Thu Apr 30 2015 - 00:07:44 EST

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/kernel/machine_kexec_64.c between commit 4545c8988013 ("x86:
introduce kaslr_offset()") from the livepatching tree and commit
22543072a261 ("kdump, vmcoreinfo: report actual value of phys_base")
from the akpm-current tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/kernel/machine_kexec_64.c
index e1029633f664,ab48c252e661..000000000000
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@@ -335,7 -334,8 +335,8 @@@ void arch_crash_save_vmcoreinfo(void
- (unsigned long)&_text - __START_KERNEL);
+ kaslr_offset());

/* arch-dependent functionality related to kexec file-based syscall */

Attachment: pgp06Dh0vTHQl.pgp
Description: OpenPGP digital signature