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()
  ...

24 files changed, 58 insertions, 85 deletions

diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index d9ea09b11cf8..a75174a33723 100644
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -23,7 +23,7 @@ config NET_9P_VIRTIO
           guest partitions and a host partition.
 
 config NET_9P_RDMA
-        depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL
+        depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS
         tristate "9P RDMA Transport (Experimental)"
         help
           This builds support for an RDMA transport.
diff --git a/net/Kconfig b/net/Kconfig
index 5a1888bb036d..6f676ab885be 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -90,7 +90,6 @@ config NETWORK_SECMARK
 
 config NETWORK_PHY_TIMESTAMPING
         bool "Timestamping in PHY devices"
-        depends on EXPERIMENTAL
         help
           This allows timestamping of network packets by PHYs with
           hardware timestamping capabilities. This option adds some
@@ -278,7 +277,7 @@ config NET_PKTGEN
 
 config NET_TCPPROBE
         tristate "TCP connection probing"
-        depends on INET && EXPERIMENTAL && PROC_FS && KPROBES
+        depends on INET && PROC_FS && KPROBES
         ---help---
         This module allows for capturing the changes to TCP connection
         state in response to incoming packets. It is used for debugging
@@ -295,7 +294,7 @@ config NET_TCPPROBE
 
 config NET_DROP_MONITOR
         tristate "Network packet drop alerting service"
-        depends on INET && EXPERIMENTAL && TRACEPOINTS
+        depends on INET && TRACEPOINTS
         ---help---
         This feature provides an alerting service to userspace in the
         event that packets are discarded in the network stack.  Alerts
diff --git a/net/ceph/Kconfig b/net/ceph/Kconfig
index cc04dd667a10..e50cc69ae8ca 100644
--- a/net/ceph/Kconfig
+++ b/net/ceph/Kconfig
@@ -1,6 +1,6 @@
 config CEPH_LIB
-        tristate "Ceph core library (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
+        tristate "Ceph core library"
+        depends on INET
         select LIBCRC32C
         select CRYPTO_AES
         select CRYPTO
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index b75968a04017..8c0ef71bed2f 100644
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -1,6 +1,6 @@
 menuconfig IP_DCCP
-        tristate "The DCCP Protocol (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
+        tristate "The DCCP Protocol"
+        depends on INET
         ---help---
           Datagram Congestion Control Protocol (RFC 4340)
 
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 0581143cb800..8ba3fc9d6d16 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -1,5 +1,4 @@
-menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+menu "DCCP CCIDs Configuration"
 
 config IP_DCCP_CCID2_DEBUG
         bool "CCID-2 debugging messages"
@@ -12,7 +11,7 @@ config IP_DCCP_CCID2_DEBUG
           If in doubt, say N.
 
 config IP_DCCP_CCID3
-        bool "CCID-3 (TCP-Friendly) (EXPERIMENTAL)"
+        bool "CCID-3 (TCP-Friendly)"
         def_bool y if (IP_DCCP = y || IP_DCCP = m)
         ---help---
           CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based
diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig
index 7914fd619c5c..f3393e154f0f 100644
--- a/net/decnet/Kconfig
+++ b/net/decnet/Kconfig
@@ -25,8 +25,8 @@ config DECNET
           The module is called decnet.
 
 config DECNET_ROUTER
-        bool "DECnet: router support (EXPERIMENTAL)"
-        depends on DECNET && EXPERIMENTAL
+        bool "DECnet: router support"
+        depends on DECNET
         select FIB_RULES
         ---help---
           Add support for turning your DECnet Endnode into a level 1 or 2
diff --git a/net/decnet/netfilter/Kconfig b/net/decnet/netfilter/Kconfig
index 2f81de5e752f..8d7c109d5109 100644
--- a/net/decnet/netfilter/Kconfig
+++ b/net/decnet/netfilter/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "DECnet: Netfilter Configuration"
-        depends on DECNET && NETFILTER && EXPERIMENTAL
+        depends on DECNET && NETFILTER
         depends on NETFILTER_ADVANCED
 
 config DECNET_NF_GRABULATOR
diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index 7dee65052925..b2e06df0076c 100644
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -1,6 +1,5 @@
 config IEEE802154
-        tristate "IEEE Std 802.15.4 Low-Rate Wireless Personal Area Networks support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "IEEE Std 802.15.4 Low-Rate Wireless Personal Area Networks support"
         ---help---
           IEEE Std 802.15.4 defines a low data rate, low power and low
           complexity short range wireless personal area networks. It was
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index 1627ef2e8522..13571eae6bae 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -91,7 +91,7 @@ static struct class wpan_phy_class = {
 static DEFINE_MUTEX(wpan_phy_mutex);
 static int wpan_phy_idx;
 
-static int wpan_phy_match(struct device *dev, void *data)
+static int wpan_phy_match(struct device *dev, const void *data)
 {
         return !strcmp(dev_name(dev), (const char *)data);
 }
@@ -103,8 +103,7 @@ struct wpan_phy *wpan_phy_find(const char *str)
         if (WARN_ON(!str))
                 return NULL;
 
-        dev = class_find_device(&wpan_phy_class, NULL,
-                        (void *)str, wpan_phy_match);
+        dev = class_find_device(&wpan_phy_class, NULL, str, wpan_phy_match);
         if (!dev)
                 return NULL;
 
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 5a19aeb86094..7944df768454 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -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---
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index d8d6f2a5bf12..ce2d43e1f09f 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -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
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 4f7fe7270e37..3f2eb57cc51d 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -50,16 +50,15 @@ config IPV6_ROUTER_PREF
           If unsure, say N.
 
 config IPV6_ROUTE_INFO
-        bool "IPv6: Route Information (RFC 4191) support (EXPERIMENTAL)"
-        depends on IPV6_ROUTER_PREF && EXPERIMENTAL
+        bool "IPv6: Route Information (RFC 4191) support"
+        depends on IPV6_ROUTER_PREF
         ---help---
           This is experimental support of Route Information.
 
           If unsure, say N.
 
 config IPV6_OPTIMISTIC_DAD
-        bool "IPv6: Enable RFC 4429 Optimistic DAD (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "IPv6: Enable RFC 4429 Optimistic DAD"
         ---help---
           This is experimental support for optimistic Duplicate
           Address Detection.  It allows for autoconfigured addresses
@@ -105,8 +104,7 @@ config INET6_IPCOMP
           If unsure, say Y.
 
 config IPV6_MIP6
-        tristate "IPv6: Mobility (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "IPv6: Mobility"
         select XFRM
         ---help---
           Support for IPv6 Mobility described in RFC 3775.
@@ -150,8 +148,7 @@ config INET6_XFRM_MODE_BEET
           If unsure, say Y.
 
 config INET6_XFRM_MODE_ROUTEOPTIMIZATION
-        tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "IPv6: MIPv6 route optimization mode"
         select XFRM
         ---help---
           Support for MIPv6 route optimization mode.
@@ -171,8 +168,8 @@ config IPV6_SIT
           Saying M here will produce a module called sit. If unsure, say Y.
 
 config IPV6_SIT_6RD
-        bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
-        depends on IPV6_SIT && EXPERIMENTAL
+        bool "IPv6: IPv6 Rapid Deployment (6RD)"
+        depends on IPV6_SIT
         default n
         ---help---
           IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon
@@ -219,7 +216,6 @@ config IPV6_GRE
 
 config IPV6_MULTIPLE_TABLES
         bool "IPv6: Multiple Routing Tables"
-        depends on EXPERIMENTAL
         select FIB_RULES
         ---help---
           Support multiple routing tables.
@@ -239,8 +235,8 @@ config IPV6_SUBTREES
           If unsure, say N.
 
 config IPV6_MROUTE
-        bool "IPv6: multicast routing (EXPERIMENTAL)"
-        depends on IPV6 && EXPERIMENTAL
+        bool "IPv6: multicast routing"
+        depends on IPV6
         ---help---
           Experimental support for IPv6 multicast forwarding.
           If unsure, say N.
@@ -260,7 +256,7 @@ config IPV6_MROUTE_MULTIPLE_TABLES
           If unsure, say N.
 
 config IPV6_PIMSM_V2
-        bool "IPv6: PIM-SM version 2 support (EXPERIMENTAL)"
+        bool "IPv6: PIM-SM version 2 support"
         depends on IPV6_MROUTE
         ---help---
           Support for IPv6 PIM multicast routing protocol PIM-SMv2.
diff --git a/net/l2tp/Kconfig b/net/l2tp/Kconfig
index 147a8fd47a17..adb9843dd7cf 100644
--- a/net/l2tp/Kconfig
+++ b/net/l2tp/Kconfig
@@ -46,8 +46,8 @@ config L2TP_DEBUGFS
           will be called l2tp_debugfs.
 
 config L2TP_V3
-        bool "L2TPv3 support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && L2TP
+        bool "L2TPv3 support"
+        depends on L2TP
         help
           Layer Two Tunneling Protocol Version 3
 
diff --git a/net/lapb/Kconfig b/net/lapb/Kconfig
index f0b5efb31a00..6481839b76c9 100644
--- a/net/lapb/Kconfig
+++ b/net/lapb/Kconfig
@@ -3,8 +3,7 @@
 #
 
 config LAPB
-        tristate "LAPB Data Link Driver (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "LAPB Data Link Driver"
         ---help---
           Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.
           the lower) part of the X.25 protocol. It offers a reliable
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 0ecf947ad378..62535fe9f570 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -81,7 +81,7 @@ comment "Some wireless drivers require a rate control algorithm"
 
 config MAC80211_MESH
         bool "Enable mac80211 mesh networking (pre-802.11s) support"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211
         ---help---
          This options enables support of Draft 802.11s mesh networking.
          The implementation is based on Draft 2.08 of the Mesh Networking
diff --git a/net/mac802154/Kconfig b/net/mac802154/Kconfig
index a967ddaa4e2f..b33dd76d4307 100644
--- a/net/mac802154/Kconfig
+++ b/net/mac802154/Kconfig
@@ -1,6 +1,6 @@
 config MAC802154
         tristate "Generic IEEE 802.15.4 Soft Networking Stack (mac802154)"
-        depends on IEEE802154 && EXPERIMENTAL
+        depends on IEEE802154
         select CRC_CCITT
         ---help---
           This option enables the hardware independent IEEE 802.15.4
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index d4dd702574e4..56d22cae5906 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -131,8 +131,7 @@ config NF_CONNTRACK_LABELS
           to connection tracking entries.  It selected by the connlabel match.
 
 config NF_CT_PROTO_DCCP
-        tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate 'DCCP protocol connection tracking support'
         depends on NETFILTER_ADVANCED
         default IP_DCCP
         help
@@ -145,8 +144,7 @@ config NF_CT_PROTO_GRE
         tristate
 
 config NF_CT_PROTO_SCTP
-        tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate 'SCTP protocol connection tracking support'
         depends on NETFILTER_ADVANCED
         default IP_SCTP
         help
@@ -287,8 +285,7 @@ config NF_CONNTRACK_PPTP
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_SANE
-        tristate "SANE protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "SANE protocol support"
         depends on NETFILTER_ADVANCED
         help
           SANE is a protocol for remote access to scanners as implemented
@@ -415,8 +412,7 @@ endif # NF_CONNTRACK
 
 # transparent proxy support
 config NETFILTER_TPROXY
-        tristate "Transparent proxying support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "Transparent proxying support"
         depends on IP_NF_MANGLE
         depends on NETFILTER_ADVANCED
         help
@@ -724,8 +720,7 @@ config NETFILTER_XT_TARGET_TEE
         this clone be rerouted to another nexthop.
 
 config NETFILTER_XT_TARGET_TPROXY
-        tristate '"TPROXY" target support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate '"TPROXY" target support'
         depends on NETFILTER_TPROXY
         depends on NETFILTER_XTABLES
         depends on NETFILTER_ADVANCED
@@ -789,8 +784,7 @@ config NETFILTER_XT_TARGET_TCPMSS
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NETFILTER_XT_TARGET_TCPOPTSTRIP
-        tristate '"TCPOPTSTRIP" target support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate '"TCPOPTSTRIP" target support'
         depends on IP_NF_MANGLE || IP6_NF_MANGLE
         depends on NETFILTER_ADVANCED
         help
@@ -1173,8 +1167,7 @@ config NETFILTER_XT_MATCH_RECENT
         Official Website: <http://snowman.net/projects/ipt_recent/>
 
 config NETFILTER_XT_MATCH_SCTP
-        tristate  '"sctp" protocol match support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate  '"sctp" protocol match support'
         depends on NETFILTER_ADVANCED
         default IP_SCTP
         help
@@ -1186,8 +1179,7 @@ config NETFILTER_XT_MATCH_SCTP
           <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_SOCKET
-        tristate '"socket" match support (EXPERIMENTAL)'
-        depends on EXPERIMENTAL
+        tristate '"socket" match support'
         depends on NETFILTER_TPROXY
         depends on NETFILTER_XTABLES
         depends on NETFILTER_ADVANCED
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 25522e56d350..6ceee8e181ca 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -730,10 +730,10 @@ struct class nfc_class = {
 };
 EXPORT_SYMBOL(nfc_class);
 
-static int match_idx(struct device *d, void *data)
+static int match_idx(struct device *d, const void *data)
 {
         struct nfc_dev *dev = to_nfc_dev(d);
-        unsigned int *idx = data;
+        const unsigned int *idx = data;
 
         return dev->idx == *idx;
 }
diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index ec753b3ae72a..f2c670ba7b9b 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -1,7 +1,7 @@
 
 config RDS
-        tristate "The RDS Protocol (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
+        tristate "The RDS Protocol"
+        depends on INET
         ---help---
           The RDS (Reliable Datagram Sockets) protocol provides reliable,
           sequenced delivery of datagrams over Infiniband, iWARP,
diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig
index 0d3103c4f11c..23dcef12b986 100644
--- a/net/rxrpc/Kconfig
+++ b/net/rxrpc/Kconfig
@@ -4,7 +4,7 @@
 
 config AF_RXRPC
         tristate "RxRPC session sockets"
-        depends on INET && EXPERIMENTAL
+        depends on INET
         select CRYPTO
         select KEYS
         help
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 03d03e37a7d5..516fe2caac2c 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -10,7 +10,7 @@ config SUNRPC_BACKCHANNEL
 
 config SUNRPC_XPRT_RDMA
         tristate
-        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL
+        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
         default SUNRPC && INFINIBAND
         help
           This option allows the NFS client and server to support
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index bc41bd31eadc..4f99600a5fed 100644
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -3,8 +3,8 @@
 #
 
 menuconfig TIPC
-        tristate "The TIPC Protocol (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
+        tristate "The TIPC Protocol"
+        depends on INET
         ---help---
           The Transparent Inter Process Communication (TIPC) protocol is
           specially designed for intra cluster communication. This protocol
diff --git a/net/x25/Kconfig b/net/x25/Kconfig
index e6759c9660bb..c959312c45e3 100644
--- a/net/x25/Kconfig
+++ b/net/x25/Kconfig
@@ -3,8 +3,7 @@
 #
 
 config X25
-        tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "CCITT X.25 Packet Layer"
         ---help---
           X.25 is a set of standardized network protocols, similar in scope to
           frame relay; the one physical line from your box to the X.25 network
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index ce90b8d92365..bda1a13628a8 100644
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -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.