mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Driver core patches for 3.9-rc1
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 <[email protected]>
-----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()
...
This commit is contained in:
commit
06991c28f3
378 changed files with 1686 additions and 1880 deletions
|
|
@ -488,7 +488,6 @@ config TCP_CONG_HTCP
|
|||
|
||||
config TCP_CONG_HSTCP
|
||||
tristate "High Speed TCP"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
Sally Floyd's High Speed TCP (RFC 3649) congestion control.
|
||||
|
|
@ -499,7 +498,6 @@ config TCP_CONG_HSTCP
|
|||
|
||||
config TCP_CONG_HYBLA
|
||||
tristate "TCP-Hybla congestion control algorithm"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
TCP-Hybla is a sender-side only change that eliminates penalization of
|
||||
|
|
@ -509,7 +507,6 @@ config TCP_CONG_HYBLA
|
|||
|
||||
config TCP_CONG_VEGAS
|
||||
tristate "TCP Vegas"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
TCP Vegas is a sender-side only change to TCP that anticipates
|
||||
|
|
@ -520,7 +517,6 @@ config TCP_CONG_VEGAS
|
|||
|
||||
config TCP_CONG_SCALABLE
|
||||
tristate "Scalable TCP"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
Scalable TCP is a sender-side only change to TCP which uses a
|
||||
|
|
@ -530,7 +526,6 @@ config TCP_CONG_SCALABLE
|
|||
|
||||
config TCP_CONG_LP
|
||||
tristate "TCP Low Priority"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
|
||||
|
|
@ -540,7 +535,6 @@ config TCP_CONG_LP
|
|||
|
||||
config TCP_CONG_VENO
|
||||
tristate "TCP Veno"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
TCP Veno is a sender-side only enhancement of TCP to obtain better
|
||||
|
|
@ -552,7 +546,6 @@ config TCP_CONG_VENO
|
|||
|
||||
config TCP_CONG_YEAH
|
||||
tristate "YeAH TCP"
|
||||
depends on EXPERIMENTAL
|
||||
select TCP_CONG_VEGAS
|
||||
default n
|
||||
---help---
|
||||
|
|
@ -567,7 +560,6 @@ config TCP_CONG_YEAH
|
|||
|
||||
config TCP_CONG_ILLINOIS
|
||||
tristate "TCP Illinois"
|
||||
depends on EXPERIMENTAL
|
||||
default n
|
||||
---help---
|
||||
TCP-Illinois is a sender-side modification of TCP Reno for
|
||||
|
|
@ -631,8 +623,7 @@ config DEFAULT_TCP_CONG
|
|||
default "cubic"
|
||||
|
||||
config TCP_MD5SIG
|
||||
bool "TCP: MD5 Signature Option support (RFC2385) (EXPERIMENTAL)"
|
||||
depends on EXPERIMENTAL
|
||||
bool "TCP: MD5 Signature Option support (RFC2385)"
|
||||
select CRYPTO
|
||||
select CRYPTO_MD5
|
||||
---help---
|
||||
|
|
|
|||
|
|
@ -241,8 +241,8 @@ config IP_NF_MANGLE
|
|||
To compile it as a module, choose M here. If unsure, say N.
|
||||
|
||||
config IP_NF_TARGET_CLUSTERIP
|
||||
tristate "CLUSTERIP target support (EXPERIMENTAL)"
|
||||
depends on IP_NF_MANGLE && EXPERIMENTAL
|
||||
tristate "CLUSTERIP target support"
|
||||
depends on IP_NF_MANGLE
|
||||
depends on NF_CONNTRACK_IPV4
|
||||
depends on NETFILTER_ADVANCED
|
||||
select NF_CONNTRACK_MARK
|
||||
|
|
|
|||
Loading…
Reference in a new issue