Merge 3.7-rc5 into driver-core-next

diff --git a/Documentation/zh_CN/arm64/memory.txt b/Documentation/zh_CN/arm64/memory.txt
index 83b519314706334877ae797b947c54b1a0a06cb7..2a744997d30e37c0594c398fe973586845ad3769 100644 (file)
--- a/Documentation/zh_CN/arm64/memory.txt
+++ b/Documentation/zh_CN/arm64/memory.txt
@@ -61,7 +61,7 @@ ffffffbe00000000      ffffffbffbffffff          ~8GB          [防护页，未来用于 vmmemap]
 
 ffffffbffc000000       ffffffbfffffffff          64MB          模块
 
-ffffffc000000000       ffffffffffffffff         256GB          内存空间
+ffffffc000000000       ffffffffffffffff         256GB          内核逻辑内存映射
 
 
 4KB 页大小的转换表查找：

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index b34b5cda5ae110aeec980b6ec7c2ec608490a093..c8b453939da21eedcf6c8c1728051fef98900897 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT
          on the rootfs is completely empty.
 
 config STANDALONE
-       bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+       bool "Select only drivers that don't need compile-time external firmware"
        default y
        help
          Select this option if you don't have magic firmware for drivers that
@@ -185,7 +185,6 @@ config DMA_SHARED_BUFFER
        bool
        default n
        select ANON_INODES
-       depends on EXPERIMENTAL
        help
          This option enables the framework for buffer-sharing between
          multiple drivers. A buffer is associated with a file using driver
@@ -193,8 +192,8 @@ config DMA_SHARED_BUFFER
          driver.
 
 config CMA
-       bool "Contiguous Memory Allocator (EXPERIMENTAL)"
-       depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL
+       bool "Contiguous Memory Allocator"
+       depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
        select MIGRATION
        select MEMORY_ISOLATION
        help

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 8fc200b2e2c0a3ceed42364b467a2ea26b574fcf..d78b204e65c1728603384bb4f00f5e54f0601f69 100644 (file)
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -158,7 +158,7 @@ attribute_container_add_device(struct device *dev,
 
                ic = kzalloc(sizeof(*ic), GFP_KERNEL);
                if (!ic) {
-                       dev_printk(KERN_ERR, dev, "failed to allocate class container\n");
+                       dev_err(dev, "failed to allocate class container\n");
                        continue;
                }
 

diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 8731979d668a0592cc966191f8af1df9ab155a60..6683906647640da75238198ac47a07561fd131f9 100644 (file)
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -50,8 +50,8 @@ static void devres_log(struct device *dev, struct devres_node *node,
                       const char *op)
 {
        if (unlikely(log_devres))
-               dev_printk(KERN_ERR, dev, "DEVRES %3s %p %s (%lu bytes)\n",
-                          op, node, node->name, (unsigned long)node->size);
+               dev_err(dev, "DEVRES %3s %p %s (%lu bytes)\n",
+                       op, node, node->name, (unsigned long)node->size);
 }
 #else /* CONFIG_DEBUG_DEVRES */
 #define set_node_dbginfo(node, n, s)   do {} while (0)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 72c776f2a1f528db39398a0983ae86730ebf24c1..1e8f65420db7440c50e06e59d33127eee5455694 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -44,7 +44,7 @@ EXPORT_SYMBOL_GPL(platform_bus);
  * be setup before the platform_notifier is called.  So if a user needs to
  * manipulate any relevant information in the pdev_archdata they can do:
  *
- *     platform_devic_alloc()
+ *     platform_device_alloc()
  *     ... manipulate ...
  *     platform_device_add()
  *