mirror of
https://github.com/torvalds/linux.git
synced 2026-07-04 20:18:02 +02: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()
...
|
||
|---|---|---|
| .. | ||
| amd76xrom.c | ||
| autcpu12-nvram.c | ||
| bfin-async-flash.c | ||
| cfi_flagadm.c | ||
| ck804xrom.c | ||
| dbox2-flash.c | ||
| dc21285.c | ||
| dilnetpc.c | ||
| dmv182.c | ||
| esb2rom.c | ||
| gpio-addr-flash.c | ||
| h720x-flash.c | ||
| ichxrom.c | ||
| impa7.c | ||
| intel_vr_nor.c | ||
| ixp4xx.c | ||
| ixp2000.c | ||
| Kconfig | ||
| l440gx.c | ||
| lantiq-flash.c | ||
| latch-addr-flash.c | ||
| Makefile | ||
| map_funcs.c | ||
| mbx860.c | ||
| netsc520.c | ||
| nettel.c | ||
| octagon-5066.c | ||
| pci.c | ||
| pcmciamtd.c | ||
| physmap_of.c | ||
| physmap.c | ||
| pismo.c | ||
| plat-ram.c | ||
| pmcmsp-flash.c | ||
| pxa2xx-flash.c | ||
| rbtx4939-flash.c | ||
| rpxlite.c | ||
| sa1100-flash.c | ||
| sbc_gxx.c | ||
| sc520cdp.c | ||
| scb2_flash.c | ||
| scx200_docflash.c | ||
| solutionengine.c | ||
| sun_uflash.c | ||
| tqm8xxl.c | ||
| ts5500_flash.c | ||
| tsunami_flash.c | ||
| uclinux.c | ||
| vmax301.c | ||
| vmu-flash.c | ||