Merge branch 'driver-core-next' into Linux 3.2
Greg Kroah-Hartman [Fri, 6 Jan 2012 19:42:52 +0000 (11:42 -0800)]
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

31 files changed:
1  2 
MAINTAINERS
arch/arm/mach-bcmring/core.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/powerpc/kernel/smp.c
arch/powerpc/mm/numa.c
arch/powerpc/platforms/cell/spu_base.c
arch/s390/kernel/topology.c
arch/tile/kernel/sysfs.c
arch/x86/include/asm/mce.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/hpet.c
arch/x86/kernel/microcode_core.c
drivers/base/core.c
drivers/base/node.c
drivers/bluetooth/btusb.c
drivers/leds/led-class.c
drivers/media/rc/ati_remote.c
drivers/net/bonding/bond_sysfs.c
drivers/net/usb/asix.c
drivers/net/usb/cdc_ether.c
drivers/net/usb/lg-vl600.c
drivers/net/usb/smsc75xx.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/usb/storage/ene_ub6250.c
include/linux/device.h
include/linux/i2c.h
kernel/sched.c
kernel/time/clocksource.c
mm/hugetlb.c
mm/vmscan.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -535,7 -541,7 +537,7 @@@ static int __init microcode_init(void
  
        error = microcode_dev_init();
        if (error)
-               goto out_sysdev_driver;
 -              return error;
++              goto out_driver;
  
        register_syscore_ops(&mc_syscore_ops);
        register_hotcpu_notifier(&mc_cpu_notifier);
                " <tigran@aivazian.fsnet.co.uk>, Peter Oruba\n");
  
        return 0;
 +
- out_sysdev_driver:
++out_driver:
 +      get_online_cpus();
 +      mutex_lock(&microcode_mutex);
 +
-       sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
++      subsys_interface_unregister(&mc_cpu_interface);
 +
 +      mutex_unlock(&microcode_mutex);
 +      put_online_cpus();
 +
 +out_pdev:
 +      platform_device_unregister(microcode_pdev);
 +      return error;
 +
  }
  module_init(microcode_init);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/vmscan.c
Simple merge