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() ...
This commit is contained in:
@@ -21,8 +21,8 @@ config XFRM_USER
|
||||
If unsure, say Y.
|
||||
|
||||
config XFRM_SUB_POLICY
|
||||
bool "Transformation sub policy support (EXPERIMENTAL)"
|
||||
depends on XFRM && EXPERIMENTAL
|
||||
bool "Transformation sub policy support"
|
||||
depends on XFRM
|
||||
---help---
|
||||
Support sub policy for developers. By using sub policy with main
|
||||
one, two policies can be applied to the same packet at once.
|
||||
@@ -31,8 +31,8 @@ config XFRM_SUB_POLICY
|
||||
If unsure, say N.
|
||||
|
||||
config XFRM_MIGRATE
|
||||
bool "Transformation migrate database (EXPERIMENTAL)"
|
||||
depends on XFRM && EXPERIMENTAL
|
||||
bool "Transformation migrate database"
|
||||
depends on XFRM
|
||||
---help---
|
||||
A feature to update locator(s) of a given IPsec security
|
||||
association dynamically. This feature is required, for
|
||||
@@ -42,8 +42,8 @@ config XFRM_MIGRATE
|
||||
If unsure, say N.
|
||||
|
||||
config XFRM_STATISTICS
|
||||
bool "Transformation statistics (EXPERIMENTAL)"
|
||||
depends on INET && XFRM && PROC_FS && EXPERIMENTAL
|
||||
bool "Transformation statistics"
|
||||
depends on INET && XFRM && PROC_FS
|
||||
---help---
|
||||
This statistics is not a SNMP/MIB specification but shows
|
||||
statistics about transformation error (or almost error) factor
|
||||
@@ -68,8 +68,8 @@ config NET_KEY
|
||||
Say Y unless you know what you are doing.
|
||||
|
||||
config NET_KEY_MIGRATE
|
||||
bool "PF_KEY MIGRATE (EXPERIMENTAL)"
|
||||
depends on NET_KEY && EXPERIMENTAL
|
||||
bool "PF_KEY MIGRATE"
|
||||
depends on NET_KEY
|
||||
select XFRM_MIGRATE
|
||||
---help---
|
||||
Add a PF_KEY MIGRATE message to PF_KEYv2 socket family.
|
||||
|
Reference in New Issue
Block a user