linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce{,_64}.c between commit mce_init_device
("x86, mce: Rename sysfs variables") from the  tree and commit
10242805fc2c7f25d63097426def1bb3c8545db9 ("cpumask: alloc zeroed cpumask
for static cpumask_var_ts") from the rr tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 1d0aa9c,705bc24..0000000
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -1297,7 -1163,7 +1297,7 @@@ static __init int mce_init_device(void
  	if (!mce_available(&boot_cpu_data))
  		return -EIO;
  
- 	alloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL);
 -	alloc_cpumask_var(&mce_device_initialized, GFP_KERNEL | __GFP_ZERO);
++	alloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL | __GFP_ZERO);
  
  	err = mce_init_banks();
  	if (err)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/