Subject: linux-next: manual merge of the driver-core tree with the x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Jun 2009 17:18:30 +1000

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                    [email-masked]

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)