* [GIT PATCH] driver core merge for 3.3
@ 2012-01-06 20:11 Greg KH
2012-01-06 21:38 ` Geert Uytterhoeven
2012-01-13 1:11 ` Linus Torvalds
0 siblings, 2 replies; 10+ messages in thread
From: Greg KH @ 2012-01-06 20:11 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel
Here's the big driver core merge for 3.3.
It's based off of 3.2, as I needed to fix up a merge issue and most
importantly, a build issue with the merge that had to be done by hand,
keeping the tree bisectable.
Note, when you merge this with your tree right now, you will get a
conflict in include/linux/cpu.h, which should be pretty obvious and
trivial to resolve, and a build error in drivers/base/cpu.c that you can
fix by changing the cpu_is_hotpluggable function to look like this:
bool cpu_is_hotpluggable(unsigned cpu)
{
struct device *dev = get_cpu_device(cpu);
return dev && container_of(dev, struct cpu, dev)->hotpluggable;
}
If you want me to do this merge, just let me know, I will be glad to do
so, but I know how much you like doing these types of merges :)
Big thing here, that caused all of the merge issues, is the removal of
the sysdev code. It has been long needed to be removed, Kay finally
just did it, thankfully. There are patches pending that take advantage
of this, providing properly CPU hotplug driver loading support, that
will have to wait until 3.4, as they didn't make the merge window in
time. Note, the sysdev code isn't removed from the tree just yet, to
help catch any other tree that might not have noticed this in the
linux-next merge process. I'll send a follow-on patch after 3.3-rc1 is
out that removes this code, after ensuring that no other in-tree code is
using the sysdev structures.
Those changes touched a lot of the kernel.
So did the module_usb_driver() changes, which had to go through this
tree instead of the USB one, as they depended on some driver.h changes.
All of the fun details are in the shortlog below.
Please pull from:
git.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core.git/ driver-core-next
All of these patches have been in the linux-next and mm trees for a
while now.
thanks,
greg k-h
------------
Documentation/HOWTO | 4 +-
Documentation/development-process/5.Posting | 8 +-
Documentation/driver-model/devres.txt | 1 +
Documentation/filesystems/debugfs.txt | 32 +++-
MAINTAINERS | 2 +-
arch/arm/include/asm/mach/time.h | 2 -
arch/arm/kernel/leds.c | 21 +-
arch/arm/mach-bcmring/core.c | 1 -
arch/arm/mach-exynos/cpu.c | 15 +-
arch/arm/mach-exynos/irq-eint.c | 2 +-
arch/arm/mach-exynos/pm.c | 10 +-
arch/arm/mach-integrator/integrator_cp.c | 2 +-
arch/arm/mach-ks8695/irq.c | 2 +-
arch/arm/mach-lpc32xx/phy3250.c | 2 +-
arch/arm/mach-msm/board-sapphire.c | 2 +-
arch/arm/mach-realview/core.c | 2 +-
arch/arm/mach-realview/realview_eb.c | 2 +-
arch/arm/mach-realview/realview_pb1176.c | 2 +-
arch/arm/mach-realview/realview_pb11mp.c | 2 +-
arch/arm/mach-realview/realview_pba8.c | 2 +-
arch/arm/mach-realview/realview_pbx.c | 2 +-
arch/arm/mach-s3c2410/bast-irq.c | 2 +-
arch/arm/mach-s3c2410/cpu-freq.c | 26 +-
arch/arm/mach-s3c2410/dma.c | 28 ++-
arch/arm/mach-s3c2410/include/mach/dma.h | 4 +-
arch/arm/mach-s3c2410/mach-h1940.c | 2 +-
arch/arm/mach-s3c2410/mach-qt2410.c | 2 +-
arch/arm/mach-s3c2410/pll.c | 20 +-
arch/arm/mach-s3c2410/pm.c | 36 ++-
arch/arm/mach-s3c2410/s3c2410.c | 24 +-
arch/arm/mach-s3c2412/clock.c | 2 +-
arch/arm/mach-s3c2412/cpu-freq.c | 13 +-
arch/arm/mach-s3c2412/dma.c | 12 +-
arch/arm/mach-s3c2412/irq.c | 12 +-
arch/arm/mach-s3c2412/pm.c | 12 +-
arch/arm/mach-s3c2412/s3c2412.c | 15 +-
arch/arm/mach-s3c2416/irq.c | 12 +-
arch/arm/mach-s3c2416/pm.c | 12 +-
arch/arm/mach-s3c2416/s3c2416.c | 15 +-
arch/arm/mach-s3c2440/clock.c | 15 +-
arch/arm/mach-s3c2440/dma.c | 12 +-
arch/arm/mach-s3c2440/irq.c | 12 +-
arch/arm/mach-s3c2440/mach-rx1950.c | 2 +-
arch/arm/mach-s3c2440/mach-rx3715.c | 2 +-
arch/arm/mach-s3c2440/s3c2440-cpufreq.c | 22 +-
arch/arm/mach-s3c2440/s3c2440-pll-12000000.c | 20 +-
arch/arm/mach-s3c2440/s3c2440-pll-16934400.c | 24 +-
arch/arm/mach-s3c2440/s3c2440.c | 8 +-
arch/arm/mach-s3c2440/s3c2442.c | 17 +-
arch/arm/mach-s3c2440/s3c244x-clock.c | 19 +-
arch/arm/mach-s3c2440/s3c244x-irq.c | 20 +-
arch/arm/mach-s3c2440/s3c244x.c | 16 +-
arch/arm/mach-s3c2443/clock.c | 2 +-
arch/arm/mach-s3c2443/dma.c | 12 +-
arch/arm/mach-s3c2443/irq.c | 12 +-
arch/arm/mach-s3c2443/s3c2443.c | 15 +-
arch/arm/mach-s3c64xx/cpu.c | 19 +-
arch/arm/mach-s3c64xx/dma.c | 23 +-
arch/arm/mach-s3c64xx/irq-eint.c | 2 +-
arch/arm/mach-s3c64xx/s3c6400.c | 15 +-
arch/arm/mach-s3c64xx/s3c6410.c | 15 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +-
arch/arm/mach-s5p64x0/clock.c | 2 +-
arch/arm/mach-s5p64x0/cpu.c | 15 +-
arch/arm/mach-s5p64x0/pm.c | 10 +-
arch/arm/mach-s5pc100/cpu.c | 15 +-
arch/arm/mach-s5pv210/clock.c | 2 +-
arch/arm/mach-s5pv210/cpu.c | 15 +-
arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +-
arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
arch/arm/mach-s5pv210/pm.c | 10 +-
arch/arm/mach-versatile/core.c | 1 -
arch/arm/mach-versatile/versatile_ab.c | 1 -
arch/arm/mach-versatile/versatile_pb.c | 1 -
arch/arm/mach-vexpress/v2m.c | 2 +-
arch/arm/mach-w90x900/irq.c | 2 +-
arch/arm/plat-s3c24xx/common-smdk.c | 2 +-
arch/arm/plat-s3c24xx/cpu-freq.c | 2 +-
arch/arm/plat-s3c24xx/irq.c | 2 +-
arch/arm/plat-s3c24xx/pm-simtec.c | 1 -
arch/arm/plat-s3c24xx/s3c2410-clock.c | 2 +-
arch/arm/plat-s3c24xx/s3c2412-iotiming.c | 2 +-
arch/arm/plat-s5p/clock.c | 2 +-
arch/arm/plat-s5p/irq-eint.c | 2 +-
arch/arm/plat-samsung/clock-clksrc.c | 2 +-
arch/arm/plat-samsung/clock.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu.h | 28 +-
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 +-
arch/arm/plat-samsung/include/plat/pm.h | 2 +-
arch/arm/plat-samsung/pm-gpio.c | 2 +-
arch/arm/plat-samsung/wakeup-mask.c | 2 +-
arch/avr32/boards/merisc/merisc_sysfs.c | 1 -
arch/avr32/kernel/cpu.c | 74 +++---
arch/avr32/kernel/irq.c | 2 +-
arch/ia64/kernel/err_inject.c | 52 ++--
arch/ia64/kernel/topology.c | 10 +-
arch/m68k/platform/coldfire/gpio.c | 9 +-
arch/mips/txx9/generic/7segled.c | 44 ++--
arch/mips/txx9/generic/setup.c | 34 ++--
arch/mips/txx9/generic/setup_tx4939.c | 2 +-
arch/powerpc/include/asm/spu.h | 12 +-
arch/powerpc/include/asm/topology.h | 10 +-
arch/powerpc/kernel/cacheinfo.c | 10 +-
arch/powerpc/kernel/smp.c | 2 +-
arch/powerpc/kernel/sysfs.c | 261 +++++++++---------
arch/powerpc/mm/numa.c | 8 +-
arch/powerpc/platforms/cell/cbe_thermal.c | 144 +++++-----
arch/powerpc/platforms/cell/smp.c | 2 +-
arch/powerpc/platforms/cell/spu_base.c | 61 +++--
arch/powerpc/platforms/iseries/smp.c | 2 +-
arch/powerpc/platforms/powermac/cpufreq_32.c | 2 +-
arch/powerpc/platforms/pseries/cmm.c | 67 +++---
arch/powerpc/platforms/pseries/pseries_energy.c | 71 +++---
arch/powerpc/platforms/pseries/smp.c | 2 +-
arch/powerpc/platforms/pseries/suspend.c | 33 ++--
arch/powerpc/sysdev/ppc4xx_cpm.c | 6 +-
arch/powerpc/sysdev/qe_lib/qe_ic.c | 12 +-
arch/powerpc/sysdev/uic.c | 1 -
arch/s390/kernel/smp.c | 76 +++---
arch/s390/kernel/time.c | 260 +++++++++---------
arch/s390/kernel/topology.c | 6 +-
arch/sh/drivers/dma/dma-sysfs.c | 81 +++---
arch/sh/include/asm/dma.h | 4 +-
arch/sh/kernel/cpu/sh4/sq.c | 24 +-
arch/sparc/kernel/sysfs.c | 122 +++++-----
arch/tile/kernel/sysfs.c | 61 ++---
arch/unicore32/kernel/puv3-core.c | 1 -
arch/unicore32/kernel/puv3-nb0916.c | 1 -
arch/x86/include/asm/mce.h | 2 +-
arch/x86/kernel/cpu/intel_cacheinfo.c | 25 +-
arch/x86/kernel/cpu/mcheck/mce-internal.h | 4 +-
arch/x86/kernel/cpu/mcheck/mce.c | 128 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 11 +-
arch/x86/kernel/cpu/mcheck/therm_throt.c | 63 +++---
arch/x86/kernel/hpet.c | 1 -
arch/x86/kernel/irqinit.c | 2 +-
arch/x86/kernel/microcode_core.c | 64 +++---
arch/x86/platform/uv/uv_sysfs.c | 2 +-
drivers/Kconfig | 4 +-
drivers/acpi/processor_driver.c | 6 +-
drivers/acpi/processor_thermal.c | 1 -
drivers/base/Makefile | 4 +-
drivers/base/base.h | 12 +-
drivers/base/bus.c | 293 +++++++++++++++++++--
drivers/base/class.c | 14 +-
drivers/base/core.c | 85 +++++--
drivers/base/cpu.c | 146 ++++++-----
drivers/base/devtmpfs.c | 3 +-
drivers/base/firmware_class.c | 14 +-
drivers/base/init.c | 1 -
drivers/base/memory.c | 160 +++++-------
drivers/base/node.c | 154 ++++++------
drivers/base/platform.c | 2 +-
drivers/base/sys.c | 10 +-
drivers/base/topology.c | 51 ++--
drivers/bluetooth/ath3k.c | 14 +-
drivers/bluetooth/bcm203x.c | 21 +--
drivers/bluetooth/bfusb.c | 21 +--
drivers/bluetooth/bpa10x.c | 15 +-
drivers/bluetooth/btusb.c | 15 +-
drivers/cpufreq/cpufreq.c | 79 +++---
drivers/cpufreq/cpufreq_stats.c | 1 -
drivers/cpuidle/cpuidle.c | 12 +-
drivers/cpuidle/cpuidle.h | 10 +-
drivers/cpuidle/sysfs.c | 74 +++---
drivers/edac/edac_core.h | 7 +-
drivers/edac/edac_device.c | 1 -
drivers/edac/edac_device_sysfs.c | 20 +-
drivers/edac/edac_mc.c | 1 -
drivers/edac/edac_mc_sysfs.c | 16 +-
drivers/edac/edac_module.h | 2 -
drivers/edac/edac_pci.c | 1 -
drivers/edac/edac_pci_sysfs.c | 16 +-
drivers/edac/edac_stub.c | 27 +-
drivers/edac/mce_amd_inj.c | 13 +-
drivers/firmware/google/gsmi.c | 3 +-
drivers/gpio/gpio-samsung.c | 2 +-
drivers/hid/usbhid/usbkbd.c | 17 +--
drivers/hid/usbhid/usbmouse.c | 17 +--
drivers/hv/Kconfig | 4 +-
drivers/hv/channel_mgmt.c | 12 +
drivers/hv/hv.c | 8 +-
drivers/hv/hyperv_vmbus.h | 1 +
drivers/hv/vmbus_drv.c | 30 ++-
drivers/i2c/busses/i2c-diolan-u2c.c | 15 +-
drivers/i2c/busses/i2c-tiny-usb.c | 15 +-
drivers/input/joystick/xpad.c | 13 +-
drivers/input/misc/ati_remote2.c | 21 +--
drivers/input/misc/keyspan_remote.c | 21 +--
drivers/input/misc/powermate.c | 13 +-
drivers/input/misc/yealink.c | 17 +--
drivers/input/mouse/appletouch.c | 13 +-
drivers/input/mouse/bcm5974.c | 14 +-
drivers/input/tablet/acecad.c | 17 +--
drivers/input/tablet/aiptek.c | 19 +--
drivers/input/tablet/gtco.c | 28 +--
drivers/input/tablet/hanwang.c | 13 +-
drivers/input/tablet/kbtab.c | 20 +--
drivers/input/tablet/wacom_sys.c | 19 +--
drivers/input/touchscreen/usbtouchscreen.c | 13 +-
drivers/isdn/hardware/mISDN/hfcsusb.c | 28 +--
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 1 -
drivers/macintosh/smu.c | 4 -
drivers/media/dvb/b2c2/flexcop-usb.c | 20 +--
drivers/media/dvb/dvb-usb/a800.c | 21 +--
drivers/media/dvb/dvb-usb/af9015.c | 20 +--
drivers/media/dvb/dvb-usb/anysee.c | 21 +--
drivers/media/dvb/dvb-usb/au6610.c | 21 +--
drivers/media/dvb/dvb-usb/az6027.c | 23 +--
drivers/media/dvb/dvb-usb/ce6230.c | 22 +--
drivers/media/dvb/dvb-usb/cinergyT2-core.c | 20 +--
drivers/media/dvb/dvb-usb/cxusb.c | 21 +--
drivers/media/dvb/dvb-usb/dib0700_core.c | 22 +--
drivers/media/dvb/dvb-usb/dibusb-mb.c | 21 +--
drivers/media/dvb/dvb-usb/dibusb-mc.c | 21 +--
drivers/media/dvb/dvb-usb/digitv.c | 21 +--
drivers/media/dvb/dvb-usb/dtt200u.c | 21 +--
drivers/media/dvb/dvb-usb/dtv5100.c | 21 +--
drivers/media/dvb/dvb-usb/dw2102.c | 17 +--
drivers/media/dvb/dvb-usb/ec168.c | 22 +--
drivers/media/dvb/dvb-usb/friio.c | 23 +--
drivers/media/dvb/dvb-usb/gl861.c | 21 +--
drivers/media/dvb/dvb-usb/gp8psk.c | 21 +--
drivers/media/dvb/dvb-usb/it913x.c | 21 +--
drivers/media/dvb/dvb-usb/lmedm04.c | 21 +--
drivers/media/dvb/dvb-usb/m920x.c | 22 +--
drivers/media/dvb/dvb-usb/mxl111sf.c | 19 +--
drivers/media/dvb/dvb-usb/nova-t-usb2.c | 21 +--
drivers/media/dvb/dvb-usb/opera1.c | 17 +--
drivers/media/dvb/dvb-usb/pctv452e.c | 17 +--
drivers/media/dvb/dvb-usb/technisat-usb2.c | 20 +--
drivers/media/dvb/dvb-usb/ttusb2.c | 21 +--
drivers/media/dvb/dvb-usb/umt-010.c | 21 +--
drivers/media/dvb/dvb-usb/vp702x.c | 21 +--
drivers/media/dvb/dvb-usb/vp7045.c | 21 +--
drivers/media/dvb/siano/smsusb.c | 21 +--
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 21 +--
drivers/media/dvb/ttusb-dec/ttusb_dec.c | 21 +--
drivers/media/radio/dsbr100.c | 16 +-
drivers/media/radio/radio-mr800.c | 23 +--
drivers/media/radio/si470x/radio-si470x-usb.c | 28 +--
drivers/media/rc/ati_remote.c | 33 +---
drivers/media/rc/imon.c | 21 +--
drivers/media/rc/mceusb.c | 20 +--
drivers/media/rc/redrat3.c | 20 +--
drivers/media/rc/streamzap.c | 28 +--
drivers/media/video/cx231xx/cx231xx-cards.c | 24 +--
drivers/media/video/em28xx/em28xx-cards.c | 24 +--
drivers/media/video/et61x251/et61x251_core.c | 25 +--
drivers/media/video/gspca/benq.c | 13 +-
drivers/media/video/gspca/conex.c | 13 +-
drivers/media/video/gspca/cpia1.c | 13 +-
drivers/media/video/gspca/etoms.c | 14 +-
drivers/media/video/gspca/finepix.c | 14 +-
drivers/media/video/gspca/gl860/gl860.c | 17 +--
drivers/media/video/gspca/jeilinj.c | 14 +-
drivers/media/video/gspca/kinect.c | 14 +-
drivers/media/video/gspca/konica.c | 13 +-
drivers/media/video/gspca/m5602/m5602_core.c | 14 +-
drivers/media/video/gspca/mars.c | 13 +-
drivers/media/video/gspca/mr97310a.c | 13 +-
drivers/media/video/gspca/nw80x.c | 13 +-
drivers/media/video/gspca/ov519.c | 13 +-
drivers/media/video/gspca/ov534.c | 14 +-
drivers/media/video/gspca/ov534_9.c | 14 +-
drivers/media/video/gspca/pac207.c | 13 +-
drivers/media/video/gspca/pac7302.c | 13 +-
drivers/media/video/gspca/pac7311.c | 13 +-
drivers/media/video/gspca/se401.c | 13 +-
drivers/media/video/gspca/sn9c2028.c | 14 +-
drivers/media/video/gspca/sn9c20x.c | 13 +-
drivers/media/video/gspca/sonixb.c | 13 +-
drivers/media/video/gspca/sonixj.c | 13 +-
drivers/media/video/gspca/spca1528.c | 13 +-
drivers/media/video/gspca/spca500.c | 13 +-
drivers/media/video/gspca/spca501.c | 13 +-
drivers/media/video/gspca/spca505.c | 13 +-
drivers/media/video/gspca/spca506.c | 19 +--
drivers/media/video/gspca/spca508.c | 13 +-
drivers/media/video/gspca/spca561.c | 13 +-
drivers/media/video/gspca/sq905.c | 14 +-
drivers/media/video/gspca/sq905c.c | 14 +-
drivers/media/video/gspca/sq930x.c | 13 +-
drivers/media/video/gspca/stk014.c | 13 +-
drivers/media/video/gspca/stv0680.c | 13 +-
drivers/media/video/gspca/stv06xx/stv06xx.c | 13 +-
drivers/media/video/gspca/sunplus.c | 13 +-
drivers/media/video/gspca/t613.c | 13 +-
drivers/media/video/gspca/topro.c | 13 +-
drivers/media/video/gspca/tv8532.c | 14 +-
drivers/media/video/gspca/vc032x.c | 13 +-
drivers/media/video/gspca/vicam.c | 14 +-
drivers/media/video/gspca/xirlink_cit.c | 13 +-
drivers/media/video/gspca/zc3xx.c | 13 +-
drivers/media/video/hdpvr/hdpvr-core.c | 21 +--
drivers/media/video/s2255drv.c | 20 +--
drivers/media/video/sn9c102/sn9c102_core.c | 25 +--
drivers/media/video/stk-webcam.c | 23 +--
drivers/media/video/tm6000/tm6000-cards.c | 26 +--
drivers/media/video/zr364xx.c | 23 +--
drivers/mmc/host/ushc.c | 12 +-
drivers/mtd/nand/alauda.c | 13 +-
drivers/net/bonding/bond_sysfs.c | 1 -
drivers/net/can/usb/ems_usb.c | 26 +--
drivers/net/can/usb/esd_usb2.c | 23 +--
drivers/net/irda/irda-usb.c | 35 +---
drivers/net/irda/kingsun-sir.c | 19 +--
drivers/net/irda/ks959-sir.c | 21 +--
drivers/net/irda/ksdazzle-sir.c | 21 +--
drivers/net/irda/mcs7780.c | 23 +--
drivers/net/irda/stir4200.c | 19 +--
drivers/net/usb/asix.c | 12 +-
drivers/net/usb/catc.c | 17 +--
drivers/net/usb/cdc-phonet.c | 13 +-
drivers/net/usb/cdc_eem.c | 13 +-
drivers/net/usb/cdc_ether.c | 19 +-
drivers/net/usb/cdc_ncm.c | 15 +-
drivers/net/usb/cdc_subset.c | 12 +-
drivers/net/usb/cx82310_eth.c | 12 +-
drivers/net/usb/dm9601.c | 13 +-
drivers/net/usb/gl620a.c | 12 +-
drivers/net/usb/int51x1.c | 12 +-
drivers/net/usb/ipheth.c | 20 +--
drivers/net/usb/kalmia.c | 12 +-
drivers/net/usb/kaweth.c | 30 +--
drivers/net/usb/lg-vl600.c | 12 +-
drivers/net/usb/mcs7830.c | 12 +-
drivers/net/usb/net1080.c | 12 +-
drivers/net/usb/plusb.c | 12 +-
drivers/net/usb/rndis_host.c | 12 +-
drivers/net/usb/rtl8150.c | 15 +-
drivers/net/usb/sierra_net.c | 19 +-
drivers/net/usb/smsc75xx.c | 12 +-
drivers/net/usb/smsc95xx.c | 12 +-
drivers/net/usb/zaurus.c | 12 +-
drivers/net/wireless/ath/carl9170/usb.c | 13 +-
drivers/net/wireless/libertas/if_usb.c | 24 +--
drivers/net/wireless/libertas_tf/if_usb.c | 22 +--
drivers/net/wireless/orinoco/orinoco_usb.c | 27 +--
drivers/net/wireless/p54/p54usb.c | 13 +-
drivers/net/wireless/rndis_wlan.c | 12 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 13 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 13 +-
drivers/net/wireless/rt2x00/rt73usb.c | 13 +-
drivers/net/wireless/rtl818x/rtl8187/dev.c | 13 +-
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 13 +-
drivers/net/wireless/zd1201.c | 13 +-
drivers/nfc/pn533.c | 19 +--
drivers/platform/x86/ibm_rtl.c | 34 ++--
drivers/platform/x86/intel_scu_ipc.c | 2 +-
drivers/s390/block/xpram.c | 2 +-
drivers/s390/char/sclp_config.c | 8 +-
drivers/sh/intc/core.c | 29 +-
drivers/sh/intc/internals.h | 6 +-
drivers/sh/intc/userimask.c | 16 +-
drivers/staging/frontier/alphatrack.c | 28 +--
drivers/staging/frontier/tranzport.c | 27 +--
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 22 +--
drivers/staging/iio/accel/adis16201_core.c | 13 +-
drivers/staging/iio/accel/adis16203_core.c | 13 +-
drivers/staging/iio/accel/adis16204_core.c | 13 +-
drivers/staging/iio/accel/adis16209_core.c | 13 +-
drivers/staging/iio/accel/adis16220_core.c | 13 +-
drivers/staging/iio/accel/adis16240_core.c | 13 +-
drivers/staging/iio/accel/kxsd9.c | 13 +-
drivers/staging/iio/accel/lis3l02dq_core.c | 13 +-
drivers/staging/iio/accel/sca3000_core.c | 13 +-
drivers/staging/iio/adc/ad7192.c | 13 +-
drivers/staging/iio/adc/ad7280a.c | 13 +-
drivers/staging/iio/adc/ad7291.c | 14 +-
drivers/staging/iio/adc/ad7298_core.c | 13 +-
drivers/staging/iio/adc/ad7476_core.c | 13 +-
drivers/staging/iio/adc/ad7606_spi.c | 13 +-
drivers/staging/iio/adc/ad7780.c | 13 +-
drivers/staging/iio/adc/ad7793.c | 13 +-
drivers/staging/iio/adc/ad7816.c | 14 +-
drivers/staging/iio/adc/ad7887_core.c | 13 +-
drivers/staging/iio/adc/ad799x_core.c | 14 +-
drivers/staging/iio/adc/adt7310.c | 14 +-
drivers/staging/iio/adc/adt7410.c | 14 +-
drivers/staging/iio/adc/max1363_core.c | 14 +-
drivers/staging/iio/addac/adt7316-i2c.c | 14 +-
drivers/staging/iio/addac/adt7316-spi.c | 14 +-
drivers/staging/iio/cdc/ad7150.c | 14 +-
drivers/staging/iio/cdc/ad7152.c | 14 +-
drivers/staging/iio/cdc/ad7746.c | 14 +-
drivers/staging/iio/dac/ad5064.c | 13 +-
drivers/staging/iio/dac/ad5360.c | 13 +-
drivers/staging/iio/dac/ad5446.c | 13 +-
drivers/staging/iio/dac/ad5504.c | 13 +-
drivers/staging/iio/dac/ad5624r_spi.c | 13 +-
drivers/staging/iio/dac/ad5686.c | 13 +-
drivers/staging/iio/dac/ad5791.c | 13 +-
drivers/staging/iio/dac/max517.c | 14 +-
drivers/staging/iio/dds/ad5930.c | 13 +-
drivers/staging/iio/dds/ad9832.c | 13 +-
drivers/staging/iio/dds/ad9834.c | 13 +-
drivers/staging/iio/dds/ad9850.c | 13 +-
drivers/staging/iio/dds/ad9852.c | 13 +-
drivers/staging/iio/dds/ad9910.c | 13 +-
drivers/staging/iio/dds/ad9951.c | 13 +-
drivers/staging/iio/gyro/adis16080_core.c | 13 +-
drivers/staging/iio/gyro/adis16130_core.c | 13 +-
drivers/staging/iio/gyro/adis16260_core.c | 13 +-
drivers/staging/iio/gyro/adxrs450_core.c | 13 +-
drivers/staging/iio/impedance-analyzer/ad5933.c | 13 +-
drivers/staging/iio/imu/adis16400_core.c | 13 +-
drivers/staging/iio/light/isl29018.c | 14 +-
drivers/staging/iio/light/tsl2563.c | 14 +-
drivers/staging/iio/light/tsl2583.c | 14 +-
drivers/staging/iio/magnetometer/ak8975.c | 14 +-
drivers/staging/iio/magnetometer/hmc5843.c | 14 +-
drivers/staging/iio/meter/ade7753.c | 13 +-
drivers/staging/iio/meter/ade7754.c | 13 +-
drivers/staging/iio/meter/ade7758_core.c | 13 +-
drivers/staging/iio/meter/ade7759.c | 13 +-
drivers/staging/iio/meter/ade7854-i2c.c | 14 +-
drivers/staging/iio/meter/ade7854-spi.c | 13 +-
drivers/staging/iio/resolver/ad2s1200.c | 13 +-
drivers/staging/iio/resolver/ad2s1210.c | 13 +-
drivers/staging/iio/resolver/ad2s90.c | 13 +-
drivers/staging/keucr/usb.c | 24 +--
drivers/staging/media/go7007/go7007-usb.c | 15 +-
drivers/staging/media/lirc/lirc_igorplugusb.c | 21 +--
drivers/staging/media/lirc/lirc_imon.c | 24 +--
drivers/staging/media/lirc/lirc_sasem.c | 25 +--
drivers/staging/media/lirc/lirc_ttusbir.c | 22 +--
drivers/staging/rts5139/rts51x.c | 32 +---
drivers/staging/vt6656/main_usb.c | 14 +-
drivers/staging/winbond/wbusb.c | 13 +-
drivers/staging/wlan-ng/prism2usb.c | 14 +-
drivers/uio/uio_pdrv.c | 12 +-
drivers/uio/uio_pdrv_genirq.c | 13 +-
drivers/uio/uio_pruss.c | 14 +-
drivers/usb/atm/cxacru.c | 13 +-
drivers/usb/atm/speedtch.c | 17 +--
drivers/usb/atm/ueagle-atm.c | 31 +--
drivers/usb/class/cdc-wdm.c | 19 +--
drivers/usb/class/usblp.c | 13 +-
drivers/usb/class/usbtmc.c | 17 +--
drivers/usb/dwc3/debugfs.c | 16 +-
drivers/usb/host/hwa-hc.c | 13 +-
drivers/usb/image/microtek.c | 14 +-
drivers/usb/misc/adutux.c | 35 +---
drivers/usb/misc/cypress_cy7c63.c | 22 +--
drivers/usb/misc/cytherm.c | 26 +--
drivers/usb/misc/emi26.c | 13 +-
drivers/usb/misc/emi62.c | 17 +--
drivers/usb/misc/idmouse.c | 24 +--
drivers/usb/misc/iowarrior.c | 13 +-
drivers/usb/misc/isight_firmware.c | 13 +-
drivers/usb/misc/ldusb.c | 27 +--
drivers/usb/misc/legousbtower.c | 46 +----
drivers/usb/misc/rio500.c | 28 +--
drivers/usb/misc/trancevibrator.c | 21 +--
drivers/usb/misc/usblcd.c | 20 +--
drivers/usb/misc/usbled.c | 18 +--
drivers/usb/misc/usbsevseg.c | 18 +--
drivers/usb/misc/yurex.c | 22 +--
drivers/usb/storage/alauda.c | 13 +-
drivers/usb/storage/cypress_atacb.c | 13 +-
drivers/usb/storage/datafab.c | 13 +-
drivers/usb/storage/ene_ub6250.c | 13 +-
drivers/usb/storage/freecom.c | 13 +-
drivers/usb/storage/isd200.c | 13 +-
drivers/usb/storage/jumpshot.c | 13 +-
drivers/usb/storage/karma.c | 13 +-
drivers/usb/storage/onetouch.c | 13 +-
drivers/usb/storage/realtek_cr.c | 13 +-
drivers/usb/storage/sddr09.c | 13 +-
drivers/usb/storage/sddr55.c | 13 +-
drivers/usb/storage/shuttle_usbat.c | 13 +-
drivers/usb/storage/uas.c | 13 +-
drivers/usb/usb-skeleton.c | 21 +--
drivers/usb/wusbcore/cbaf.c | 12 +-
drivers/uwb/hwa-rc.c | 12 +-
drivers/uwb/i1480/dfu/usb.c | 20 +--
drivers/video/smscufx.c | 19 +--
drivers/video/udlfb.c | 19 +--
drivers/w1/masters/ds2490.c | 21 +--
drivers/w1/slaves/w1_therm.c | 36 +++-
drivers/w1/w1.c | 10 +
drivers/watchdog/pcwd_usb.c | 35 +---
drivers/xen/xen-balloon.c | 86 +++---
drivers/xen/xen-selfballoon.c | 76 +++---
fs/debugfs/file.c | 95 +++++++
include/linux/cpu.h | 18 +-
include/linux/debugfs.h | 26 ++
include/linux/device.h | 108 +++++++-
include/linux/edac.h | 8 +-
include/linux/i2c.h | 13 +
include/linux/kobject.h | 2 -
include/linux/kref.h | 77 +++++-
include/linux/memory.h | 3 +-
include/linux/node.h | 6 +-
include/linux/platform_device.h | 14 +-
include/linux/spi/spi.h | 11 +
include/linux/usb.h | 12 +
include/xen/balloon.h | 6 +-
kernel/rtmutex-tester.c | 37 ++--
kernel/sched.c | 40 ++--
kernel/time/clockevents.c | 1 -
kernel/time/clocksource.c | 37 ++--
lib/Makefile | 2 +-
lib/devres.c | 55 ++++-
lib/kobject.c | 37 ---
lib/kobject_uevent.c | 3 +
lib/kref.c | 97 -------
mm/compaction.c | 10 +-
mm/hugetlb.c | 34 ++--
mm/vmscan.c | 14 +-
sound/usb/6fire/chip.c | 15 +-
sound/usb/caiaq/device.c | 13 +-
sound/usb/misc/ua101.c | 14 +-
sound/usb/usx2y/us122l.c | 14 +-
sound/usb/usx2y/usbusx2y.c | 13 +-
518 files changed, 3168 insertions(+), 6888 deletions(-)
delete mode 100644 lib/kref.c
---------------
Alessandro Rubini (5):
debugfs: add tools to printk 32-bit registers
usb: dwc3: use debugfs_print_regs32()
debugfs: print_regs32: make regs array a const pointer
usb: dwc3: fix a warning
debugfs: bugfix: include <linux/io.h> in file.c
Axel Lin (1):
uio: convert drivers/uio/* to use module_platform_driver()
Bart Van Assche (2):
hv: Move Kconfig menu entry
hv: Add Kconfig menu entry
Ben Hutchings (1):
topology: Provide CPU topology in sysfs in !SMP configurations
Dan Carpenter (1):
debugfs: remove unneeded cast in debugfs_print_regs32()
Evgeniy Polyakov (1):
w1: add fast search for single slave bus
Greg Kroah-Hartman (14):
USB: Add helper macro for usb_driver boilerplate
USB: convert drivers/usb/* to use module_usb_driver()
USB: convert drivers/staging/* to use module_usb_driver()
USB: convert drivers/net/* to use module_usb_driver()
USB: convert drivers/media/* to use module_usb_driver()
USB: convert drivers/bluetooth/* to use module_usb_driver()
USB: convert drivers/input/* to use module_usb_driver()
USB: convert drivers/hid/* to use module_usb_driver()
USB: convert sound/* to use module_usb_driver()
USB: convert some miscellanies drivers to use module_usb_driver()
kref: fix up the kfree build problems
xen: fix build breakage in xen-selfballoon.c caused by sysdev conversion
arm: time.h: remove device.h #include
driver core: remove __must_check from device_create_file
Heiko Carstens (1):
debugfs: add missing #ifdef HAS_IOMEM
Joe Perches (2):
MAINTAINERS: stable: Update address
Documentation: Update stable address
K. Y. Srinivasan (6):
Staging: hv: vmbus: Support building the vmbus driver as part of the kernel
drivers: hv: Don't OOPS when you cannot init vmbus
Drivers: hv: Fix a memory leak
Drivers: hv: Make the vmbus driver unloadable
Drivers: hv: Get rid of an unnecessary check in hv.c
Drivers:hv: Fix a bug in vmbus_driver_unregister()
Kautuk Consul (1):
devtmpfsd: fix task state handling
Kay Sievers (23):
driver-core: skip uevent generation when nobody is listening
driver-core: implement 'sysdev' functionality for regular devices and buses
rtmutex-tester: convert sysdev_class to a regular subsystem
edac: convert sysdev_class to a regular subsystem
ibm_rtl: convert sysdev_class to a regular subsystem
clocksource: convert sysdev_class to a regular subsystem
xen-balloon: convert sysdev_class to a regular subsystem
cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem
convert 'memory' sysdev_class to a regular subsystem
s390: time - convert sysdev_class to a regular subsystem
power: cmm - convert sysdev_class to a regular subsystem
power: qe_ic - convert sysdev_class to a regular subsystem
power: suspend - convert sysdev_class to a regular subsystem
sh: intc - convert sysdev_class to a regular subsystem
sh: dma - convert sysdev_class to a regular subsystem
mips: 7segled - convert sysdev_class to a regular subsystem
mips: txx9_sram - convert sysdev_class to a regular subsystem
m86k: gpio - convert sysdev_class to a regular subsystem
kobject: remove kset_find_obj_hinted()
arm: leds: convert sysdev_class to a regular subsystem
arm: convert sysdev_class to a regular subsystem
clockevents: remove sysdev.h
driver-core: remove sysdev.h usage.
Kukjin Kim (1):
arm: fix up some samsung merge sysdev conversion problems
Lars-Peter Clausen (5):
drivercore: Generalize module_platform_driver
I2C: Add helper macro for i2c_driver boilerplate
SPI: Add helper macro for spi_driver boilerplate
staging:iio: Use module_i2c_driver to register I2C drivers
staging:iio: Use module_spi_driver to register SPI driver
Maciej Szmigiero (1):
W1: w1_therm: release the bus during conversion on externally powered devices
Maxin B. John (1):
firmware: google: fix gsmi.c build warning
Neil Horman (1):
firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
Peter Zijlstra (3):
kref: Inline all functions
kref: Implement kref_put in terms of kref_sub
kref: Remove the memory barriers
Uwe Kleine-König (1):
drivers_base: make argument to platform_device_register_full const
Wolfram Sang (2):
lib: devres: add annotations for #endif
lib: devres: add convenience function to remap a resource
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-06 20:11 [GIT PATCH] driver core merge for 3.3 Greg KH
@ 2012-01-06 21:38 ` Geert Uytterhoeven
2012-01-06 22:06 ` Greg KH
2012-01-13 1:11 ` Linus Torvalds
1 sibling, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2012-01-06 21:38 UTC (permalink / raw)
To: Greg KH
Cc: Linus Torvalds, Andrew Morton, linux-kernel, Ben Hutchings,
Linux-Arch
On Fri, Jan 6, 2012 at 21:11, Greg KH <gregkh@suse.de> wrote:
> Ben Hutchings (1):
> topology: Provide CPU topology in sysfs in !SMP configurations
FWIW, as reported before, I can confirm that 3.2.0-next-20120106 crashes
on m68k during boot:
Console: switching to colour frame buffer device 80x30
fb0: frame buffer device, using 304K of video memory
Non-volatile memory driver v1.3
Unable to handle kernel NULL pointer dereference at virtual address 00000020
Oops: 00000000
Modules linked in:
PC: [<000c3f72>] internal_create_group+0x20/0x1ba
SR: 2304 SP: 00c07f10 a2: 00c05c00
d0: 00000000 d1: fffff24b d2: 00000000 d3: 00000000
d4: 00000000 d5: 002f0a28 a0: 00000008 a1: 002e306e
Process swapper (pid: 1, task=00c05c00)
Frame format=7 eff addr=00000020 ssw=0505 faddr=00000020
wb 1 stat/addr/data: 0000 00000000 00000000
wb 2 stat/addr/data: 0000 00000000 00000000
wb 3 stat/addr/data: 0000 00000020 00000000
push data: 00000000 00000000 00000000 00000000
Stack from 00c07f78:
00000000 00000000 00000000 00000000 00000000 0033d5f0 0033641e 00326632
00000000 002e1ff8 000c4130 00000008 00000000 002f0a28 00336436 00000008
002f0a28 00000000 0000210c 00000000 00000000 00000000 00000000 00000000
00000000 0033d5f0 00002008 00326632 0031dae2 0033641e 0031da66 000249b6
00002f04 00000000
Call Trace: [<0033641e>] topology_sysfs_init+0x0/0x1e
[<00326632>] __alloc_bootmem+0x0/0x1a
[<000c4130>] sysfs_create_group+0xe/0x14
[<00336436>] topology_sysfs_init+0x18/0x1e
[<0000210c>] do_one_initcall+0x104/0x19a
[<00002008>] do_one_initcall+0x0/0x19a
[<00326632>] __alloc_bootmem+0x0/0x1a
[<0031dae2>] kernel_init+0x7c/0x11c
[<0033641e>] topology_sysfs_init+0x0/0x1e
[<0031da66>] kernel_init+0x0/0x11c
[<000249b6>] printk+0x0/0x1a
[<00002f04>] kernel_thread+0x3a/0x4e
Code: 2a2e 0010 4a86 6700 0162 4a84 660a 2046 <4aa8> 0018 6700 0154
4a84 6600 0122 2045 2010 6700 0128 486e fffc 2f00 2f06 61ff
Disabling lock debugging due to kernel taint
Kernel panic - not syncing: Attempted to kill init!
Reverting the above commit (ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b)
fixes it.
So to preserve bisectability, you may want to drop this ommit until the
UP-only archs have been fixed.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-06 21:38 ` Geert Uytterhoeven
@ 2012-01-06 22:06 ` Greg KH
2012-01-06 22:31 ` Ben Hutchings
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2012-01-06 22:06 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linus Torvalds, Andrew Morton, linux-kernel, Ben Hutchings,
Linux-Arch
On Fri, Jan 06, 2012 at 10:38:41PM +0100, Geert Uytterhoeven wrote:
> On Fri, Jan 6, 2012 at 21:11, Greg KH <gregkh@suse.de> wrote:
> > Ben Hutchings (1):
> > topology: Provide CPU topology in sysfs in !SMP configurations
>
> FWIW, as reported before, I can confirm that 3.2.0-next-20120106 crashes
> on m68k during boot:
>
> Console: switching to colour frame buffer device 80x30
> fb0: frame buffer device, using 304K of video memory
> Non-volatile memory driver v1.3
> Unable to handle kernel NULL pointer dereference at virtual address 00000020
> Oops: 00000000
> Modules linked in:
> PC: [<000c3f72>] internal_create_group+0x20/0x1ba
> SR: 2304 SP: 00c07f10 a2: 00c05c00
> d0: 00000000 d1: fffff24b d2: 00000000 d3: 00000000
> d4: 00000000 d5: 002f0a28 a0: 00000008 a1: 002e306e
> Process swapper (pid: 1, task=00c05c00)
> Frame format=7 eff addr=00000020 ssw=0505 faddr=00000020
> wb 1 stat/addr/data: 0000 00000000 00000000
> wb 2 stat/addr/data: 0000 00000000 00000000
> wb 3 stat/addr/data: 0000 00000020 00000000
> push data: 00000000 00000000 00000000 00000000
> Stack from 00c07f78:
> 00000000 00000000 00000000 00000000 00000000 0033d5f0 0033641e 00326632
> 00000000 002e1ff8 000c4130 00000008 00000000 002f0a28 00336436 00000008
> 002f0a28 00000000 0000210c 00000000 00000000 00000000 00000000 00000000
> 00000000 0033d5f0 00002008 00326632 0031dae2 0033641e 0031da66 000249b6
> 00002f04 00000000
> Call Trace: [<0033641e>] topology_sysfs_init+0x0/0x1e
> [<00326632>] __alloc_bootmem+0x0/0x1a
> [<000c4130>] sysfs_create_group+0xe/0x14
> [<00336436>] topology_sysfs_init+0x18/0x1e
> [<0000210c>] do_one_initcall+0x104/0x19a
> [<00002008>] do_one_initcall+0x0/0x19a
> [<00326632>] __alloc_bootmem+0x0/0x1a
> [<0031dae2>] kernel_init+0x7c/0x11c
> [<0033641e>] topology_sysfs_init+0x0/0x1e
> [<0031da66>] kernel_init+0x0/0x11c
> [<000249b6>] printk+0x0/0x1a
> [<00002f04>] kernel_thread+0x3a/0x4e
>
> Code: 2a2e 0010 4a86 6700 0162 4a84 660a 2046 <4aa8> 0018 6700 0154
> 4a84 6600 0122 2045 2010 6700 0128 486e fffc 2f00 2f06 61ff
> Disabling lock debugging due to kernel taint
> Kernel panic - not syncing: Attempted to kill init!
>
> Reverting the above commit (ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b)
> fixes it.
>
> So to preserve bisectability, you may want to drop this ommit until the
> UP-only archs have been fixed.
Ick, sorry for missing that report, you are right.
Ben, I thought this patch was for UP systems, how did this work on your
testing?
Linus, can you revert this, or I can if you want me to.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-06 22:06 ` Greg KH
@ 2012-01-06 22:31 ` Ben Hutchings
2012-01-07 19:29 ` Linus Torvalds
0 siblings, 1 reply; 10+ messages in thread
From: Ben Hutchings @ 2012-01-06 22:31 UTC (permalink / raw)
To: Greg KH
Cc: Geert Uytterhoeven, Linus Torvalds, Andrew Morton, linux-kernel,
Linux-Arch
On Fri, Jan 06, 2012 at 02:06:08PM -0800, Greg KH wrote:
> On Fri, Jan 06, 2012 at 10:38:41PM +0100, Geert Uytterhoeven wrote:
> > On Fri, Jan 6, 2012 at 21:11, Greg KH <gregkh@suse.de> wrote:
> > > Ben Hutchings (1):
> > > topology: Provide CPU topology in sysfs in !SMP configurations
> >
> > FWIW, as reported before, I can confirm that 3.2.0-next-20120106 crashes
> > on m68k during boot:
[...]
> > Disabling lock debugging due to kernel taint
> > Kernel panic - not syncing: Attempted to kill init!
> >
> > Reverting the above commit (ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b)
> > fixes it.
> >
> > So to preserve bisectability, you may want to drop this ommit until the
> > UP-only archs have been fixed.
>
> Ick, sorry for missing that report, you are right.
>
> Ben, I thought this patch was for UP systems, how did this work on your
> testing?
It works just fine on UP x86. However I have been made aware that
it breaks on m68k and I told you as much in
<1325462025.13595.189.camel@deadeye>:
> None of these architectures appears to call register_cpu():
>
> c6x frv h8300 m68k microblaze openrisc score um xtensa
>
> and therefore they will all panic at boot following this change (commit
> ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b). So either I can try to fix
> them or else it must be reverted for now.
Ben.
> Linus, can you revert this, or I can if you want me to.
>
> thanks,
>
> greg k-h
>
--
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
- Albert Camus
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-06 22:31 ` Ben Hutchings
@ 2012-01-07 19:29 ` Linus Torvalds
0 siblings, 0 replies; 10+ messages in thread
From: Linus Torvalds @ 2012-01-07 19:29 UTC (permalink / raw)
To: Ben Hutchings
Cc: Greg KH, Geert Uytterhoeven, Andrew Morton, linux-kernel,
Linux-Arch
On Fri, Jan 6, 2012 at 2:31 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
>
> It works just fine on UP x86. However I have been made aware that
> it breaks on m68k and I told you as much in
> <1325462025.13595.189.camel@deadeye>:
>
>> None of these architectures appears to call register_cpu():
>>
>> c6x frv h8300 m68k microblaze openrisc score um xtensa
>>
>> and therefore they will all panic at boot following this change (commit
>> ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b). So either I can try to fix
>> them or else it must be reverted for now.
Ok, let's try to move forward, and just have those architectures add
the appropriate "register_cpu()" calls. I can live with them breaking
for a short while, and hopefully me merging this will result in it
quickly being fixed.
Linus
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-06 20:11 [GIT PATCH] driver core merge for 3.3 Greg KH
2012-01-06 21:38 ` Geert Uytterhoeven
@ 2012-01-13 1:11 ` Linus Torvalds
2012-01-13 1:39 ` Kay Sievers
1 sibling, 1 reply; 10+ messages in thread
From: Linus Torvalds @ 2012-01-13 1:11 UTC (permalink / raw)
To: Greg KH, Kay Sievers; +Cc: Andrew Morton, linux-kernel
On Fri, Jan 6, 2012 at 12:11 PM, Greg KH <gregkh@suse.de> wrote:
>
> Big thing here, that caused all of the merge issues, is the removal of
> the sysdev code. It has been long needed to be removed, Kay finally
> just did it, thankfully. There are patches pending that take advantage
> of this, providing properly CPU hotplug driver loading support, that
> will have to wait until 3.4, as they didn't make the merge window in
> time. Note, the sysdev code isn't removed from the tree just yet, to
> help catch any other tree that might not have noticed this in the
> linux-next merge process. I'll send a follow-on patch after 3.3-rc1 is
> out that removes this code, after ensuring that no other in-tree code is
> using the sysdev structures.
Hmm. I think this is the cause of one of the suspend/resume problems I'm seeing:
Device 'machinecheck3' does not have a releae() function, it is
broken and must be fixed
that's the WARN_ON() in drivers/base/core.c (line 192), and it comes
from disable_nonboot_cpus() doing the whole device_unregister() thing.
Afaik, it's arch/x86/kernel/cpu/mcheck/mce.c.
Ho humm?
Linus
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-13 1:11 ` Linus Torvalds
@ 2012-01-13 1:39 ` Kay Sievers
2012-01-13 1:46 ` Linus Torvalds
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Kay Sievers @ 2012-01-13 1:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Greg KH, Andrew Morton, linux-kernel
On Fri, Jan 13, 2012 at 02:11, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Fri, Jan 6, 2012 at 12:11 PM, Greg KH <gregkh@suse.de> wrote:
>>
>> Big thing here, that caused all of the merge issues, is the removal of
>> the sysdev code. It has been long needed to be removed, Kay finally
>> just did it, thankfully. There are patches pending that take advantage
>> of this, providing properly CPU hotplug driver loading support, that
>> will have to wait until 3.4, as they didn't make the merge window in
>> time. Note, the sysdev code isn't removed from the tree just yet, to
>> help catch any other tree that might not have noticed this in the
>> linux-next merge process. I'll send a follow-on patch after 3.3-rc1 is
>> out that removes this code, after ensuring that no other in-tree code is
>> using the sysdev structures.
>
> Hmm. I think this is the cause of one of the suspend/resume problems I'm seeing:
>
> Device 'machinecheck3' does not have a releae() function, it is
> broken and must be fixed
>
> that's the WARN_ON() in drivers/base/core.c (line 192), and it comes
> from disable_nonboot_cpus() doing the whole device_unregister() thing.
>
> Afaik, it's arch/x86/kernel/cpu/mcheck/mce.c.
I guess this kind of warning just did not exist for the old sysdev
devices. The 'machinecheck' devices are DEFINE_PER_CPU(struct device,
mce_device) devices, so we will probably just add a dummy release
function, which might not fix the problem you are seeing.
Maybe you can check if the suspend problem goes away if you disable
CONFIG_X86_MCE?
Kay
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-13 1:39 ` Kay Sievers
@ 2012-01-13 1:46 ` Linus Torvalds
2012-01-13 18:24 ` Greg KH
2012-01-13 19:03 ` Dirk Gouders
2 siblings, 0 replies; 10+ messages in thread
From: Linus Torvalds @ 2012-01-13 1:46 UTC (permalink / raw)
To: Kay Sievers; +Cc: Greg KH, Andrew Morton, linux-kernel
On Thu, Jan 12, 2012 at 5:39 PM, Kay Sievers <kay.sievers@vrfy.org> wrote:
>
> Maybe you can check if the suspend problem goes away if you disable
> CONFIG_X86_MCE?
It does. So there is something wrong with MCE. It causes the second
suspend to hang for me. Disabling X86_MCE makes it work.
(I have other problems on that machine too, but they are unrelated)
Linus
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-13 1:39 ` Kay Sievers
2012-01-13 1:46 ` Linus Torvalds
@ 2012-01-13 18:24 ` Greg KH
2012-01-13 19:03 ` Dirk Gouders
2 siblings, 0 replies; 10+ messages in thread
From: Greg KH @ 2012-01-13 18:24 UTC (permalink / raw)
To: Kay Sievers; +Cc: Linus Torvalds, Andrew Morton, linux-kernel
On Fri, Jan 13, 2012 at 02:39:27AM +0100, Kay Sievers wrote:
> On Fri, Jan 13, 2012 at 02:11, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> > On Fri, Jan 6, 2012 at 12:11 PM, Greg KH <gregkh@suse.de> wrote:
> >>
> >> Big thing here, that caused all of the merge issues, is the removal of
> >> the sysdev code. It has been long needed to be removed, Kay finally
> >> just did it, thankfully. There are patches pending that take advantage
> >> of this, providing properly CPU hotplug driver loading support, that
> >> will have to wait until 3.4, as they didn't make the merge window in
> >> time. Note, the sysdev code isn't removed from the tree just yet, to
> >> help catch any other tree that might not have noticed this in the
> >> linux-next merge process. I'll send a follow-on patch after 3.3-rc1 is
> >> out that removes this code, after ensuring that no other in-tree code is
> >> using the sysdev structures.
> >
> > Hmm. I think this is the cause of one of the suspend/resume problems I'm seeing:
> >
> > Device 'machinecheck3' does not have a releae() function, it is
> > broken and must be fixed
> >
> > that's the WARN_ON() in drivers/base/core.c (line 192), and it comes
> > from disable_nonboot_cpus() doing the whole device_unregister() thing.
> >
> > Afaik, it's arch/x86/kernel/cpu/mcheck/mce.c.
>
> I guess this kind of warning just did not exist for the old sysdev
> devices. The 'machinecheck' devices are DEFINE_PER_CPU(struct device,
> mce_device) devices, so we will probably just add a dummy release
> function, which might not fix the problem you are seeing.
Shouldn't we have a "real" release function here for when we remove
sysdev devices? The cpu hotplug code should remove them, as should
unloading the kernel module here.
Care to make up a patch?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PATCH] driver core merge for 3.3
2012-01-13 1:39 ` Kay Sievers
2012-01-13 1:46 ` Linus Torvalds
2012-01-13 18:24 ` Greg KH
@ 2012-01-13 19:03 ` Dirk Gouders
2 siblings, 0 replies; 10+ messages in thread
From: Dirk Gouders @ 2012-01-13 19:03 UTC (permalink / raw)
To: Kay Sievers; +Cc: Linus Torvalds, Greg KH, Andrew Morton, linux-kernel
Kay Sievers <kay.sievers@vrfy.org> writes:
> On Fri, Jan 13, 2012 at 02:11, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>>
>> Hmm. I think this is the cause of one of the suspend/resume problems I'm seeing:
>>
>> Device 'machinecheck3' does not have a releae() function, it is
>> broken and must be fixed
>>
>> that's the WARN_ON() in drivers/base/core.c (line 192), and it comes
>> from disable_nonboot_cpus() doing the whole device_unregister() thing.
>>
>> Afaik, it's arch/x86/kernel/cpu/mcheck/mce.c.
>
> I guess this kind of warning just did not exist for the old sysdev
> devices. The 'machinecheck' devices are DEFINE_PER_CPU(struct device,
> mce_device) devices, so we will probably just add a dummy release
> function, which might not fix the problem you are seeing.
>
> Maybe you can check if the suspend problem goes away if you disable
> CONFIG_X86_MCE?
Hello,
three days ago I also reported about a suspend/resume problem and
disabling CONFIG_X86_MCE also helps on my machine, although I did not see
the above warning in my logs.
Dirk
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-01-13 19:03 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-06 20:11 [GIT PATCH] driver core merge for 3.3 Greg KH
2012-01-06 21:38 ` Geert Uytterhoeven
2012-01-06 22:06 ` Greg KH
2012-01-06 22:31 ` Ben Hutchings
2012-01-07 19:29 ` Linus Torvalds
2012-01-13 1:11 ` Linus Torvalds
2012-01-13 1:39 ` Kay Sievers
2012-01-13 1:46 ` Linus Torvalds
2012-01-13 18:24 ` Greg KH
2012-01-13 19:03 ` Dirk Gouders
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox