linux-kernel - linux-next: manual merge of the sfi tree with the tip 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, 3 Sep 2009 19:34:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	<sfi-devel@...plefirmware.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Feng Tang <feng.tang@...el.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the sfi tree with the tip tree

Hi all,

Today's linux-next merge of the sfi tree got a conflict in
arch/x86/kernel/setup.c between commit
b3f1b617f49447df6c3f5fac9c225aaea8b724ea ("x86: Move get/find_smp_config
to x86_init_ops") from the tip tree and commit
efafc8b213e67ed148a5b53ade29ee7b48af907d ("x86: add arch-specific SFI
support") from the sfi tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/kernel/setup.c
index a55f660,d784ea2..0000000
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -984,7 -990,10 +985,9 @@@ void __init setup_arch(char **cmdline_p
  	 * Read APIC and some other early information from ACPI tables.
  	 */
  	acpi_boot_init();
+ 
+ 	sfi_init();
  
 -#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
  	/*
  	 * get boot-time SMP configuration:
  	 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/