linux-kernel - linux-next: manual merge of the driver-core tree with the x86 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>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 3 Jun 2009 17:18:30 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kay Sievers <kay.sievers@...y.org>,
	Jan Blunck <jblunck@...e.de>,
	Dmitry Adamushko <dmitry.adamushko@...il.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>
Subject: linux-next: manual merge of the driver-core tree with the x86 tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/x86/kernel/microcode_core.c between commit
871b72dd1e12afc3f024479531d25a9339d2e3f9 ("x86: microcode: use
smp_call_function_single instead of set_cpus_allowed, cleanup of
synchronization logic") from the x86 tree and commit
3b5f472624ad5b54753388bb3c563a8f308eed88 ("Driver Core: misc: add
nodename support for misc devices") from the driver-core tree.

Just white space changes overlapping an addition.  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/microcode_core.c
index 9c44615,75bb914..0000000
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@@ -234,9 -171,10 +234,10 @@@ static const struct file_operations mic
  };
  
  static struct miscdevice microcode_dev = {
 -	.minor		= MICROCODE_MINOR,
 -	.name		= "microcode",
 -	.devnode	= "cpu/microcode",
 -	.fops		= &microcode_fops,
 +	.minor			= MICROCODE_MINOR,
 +	.name			= "microcode",
++	.devnode		= "cpu/microcode",
 +	.fops			= &microcode_fops,
  };
  
  static int __init microcode_dev_init(void)
--
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/