mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 01:23:20 +00:00
06991c28f3
Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers all
over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
If you need me to provide a merged tree to handle these resolutions,
please let me know.
Other than those patches, there's not much here, some minor fixes and
updates.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
=yWAQ
-----END PGP SIGNATURE-----
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
|
||
|---|---|---|
| .. | ||
| fixup-bcm63xx.c | ||
| fixup-capcella.c | ||
| fixup-cobalt.c | ||
| fixup-emma2rh.c | ||
| fixup-fuloong2e.c | ||
| fixup-ip32.c | ||
| fixup-jmr3927.c | ||
| fixup-lantiq.c | ||
| fixup-lemote2f.c | ||
| fixup-malta.c | ||
| fixup-mpc30x.c | ||
| fixup-pmcmsp.c | ||
| fixup-pnx8550.c | ||
| fixup-rbtx4927.c | ||
| fixup-rbtx4938.c | ||
| fixup-rc32434.c | ||
| fixup-sb1250.c | ||
| fixup-sni.c | ||
| fixup-tb0219.c | ||
| fixup-tb0226.c | ||
| fixup-tb0287.c | ||
| fixup-wrppmc.c | ||
| Makefile | ||
| msi-octeon.c | ||
| ops-bcm63xx.c | ||
| ops-bonito64.c | ||
| ops-bridge.c | ||
| ops-emma2rh.c | ||
| ops-gt64xxx_pci0.c | ||
| ops-lantiq.c | ||
| ops-loongson2.c | ||
| ops-mace.c | ||
| ops-msc.c | ||
| ops-nile4.c | ||
| ops-pmcmsp.c | ||
| ops-pnx8550.c | ||
| ops-rc32434.c | ||
| ops-sni.c | ||
| ops-tx3927.c | ||
| ops-tx4927.c | ||
| ops-vr41xx.c | ||
| pci-alchemy.c | ||
| pci-ar71xx.c | ||
| pci-ar724x.c | ||
| pci-bcm47xx.c | ||
| pci-bcm63xx.c | ||
| pci-bcm63xx.h | ||
| pci-bcm1480.c | ||
| pci-bcm1480ht.c | ||
| pci-emma2rh.c | ||
| pci-ip27.c | ||
| pci-ip32.c | ||
| pci-lantiq.c | ||
| pci-lantiq.h | ||
| pci-lasat.c | ||
| pci-octeon.c | ||
| pci-rc32434.c | ||
| pci-sb1250.c | ||
| pci-tx4927.c | ||
| pci-tx4938.c | ||
| pci-tx4939.c | ||
| pci-vr41xx.c | ||
| pci-vr41xx.h | ||
| pci-xlp.c | ||
| pci-xlr.c | ||
| pci.c | ||
| pcie-octeon.c | ||