Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg Kroah-Hartman:
 "Here's the driver core, and other driver subsystems, pull request for
  the 3.5-rc1 merge window.

  Outside of a few minor driver core changes, we ended up with the
  following different subsystem and core changes as well, due to
  interdependancies on the driver core:
   - hyperv driver updates
   - drivers/memory being created and some drivers moved into it
   - extcon driver subsystem created out of the old Android staging
     switch driver code
   - dynamic debug updates
   - printk rework, and /dev/kmsg changes

  All of this has been tested in the linux-next releases for a few weeks
  with no reported problems.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
be applied to this one.

* tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
  uio_pdrv_genirq: get irq through platform resource if not set otherwise
  memory: tegra{20,30}-mc: Remove empty *_remove()
  printk() - isolate KERN_CONT users from ordinary complete lines
  sysfs: get rid of some lockdep false positives
  Drivers: hv: util: Properly handle version negotiations.
  Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
  memory: tegra{20,30}-mc: Use dev_err_ratelimited()
  driver core: Add dev_*_ratelimited() family
  Driver Core: don't oops with unregistered driver in driver_find_device()
  printk() - restore prefix/timestamp printing for multi-newline strings
  printk: add stub for prepend_timestamp()
  ARM: tegra30: Make MC optional in Kconfig
  ARM: tegra20: Make MC optional in Kconfig
  ARM: tegra30: MC: Remove unnecessary BUG*()
  ARM: tegra20: MC: Remove unnecessary BUG*()
  printk: correctly align __log_buf
  ARM: tegra30: Add Tegra Memory Controller(MC) driver
  ARM: tegra20: Add Tegra Memory Controller(MC) driver
  printk() - restore timestamp printing at console output
  printk() - do not merge continuation lines of different threads
  ...

6 files changed, 295 insertions, 87 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 4a8aba2e5cc0..0e25c03939e3 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -353,6 +353,14 @@ config CORDIC
           This option provides an implementation of the CORDIC algorithm;
           calculations are in fixed point. Module will be called cordic.
 
+config DDR
+        bool "JEDEC DDR data"
+        help
+          Data from JEDEC specs for DDR SDRAM memories,
+          particularly the AC timing parameters and addressing
+          information. This data is useful for drivers handling
+          DDR SDRAM controllers.
+
 config MPILIB
         tristate
         select CLZ_TAB
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6777153f18f3..e11934177030 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -3,12 +3,16 @@ config PRINTK_TIME
         bool "Show timing information on printks"
         depends on PRINTK
         help
-          Selecting this option causes timing information to be
-          included in printk output.  This allows you to measure
-          the interval between kernel operations, including bootup
-          operations.  This is useful for identifying long delays
-          in kernel startup.  Or add printk.time=1 at boot-time.
-          See Documentation/kernel-parameters.txt
+          Selecting this option causes time stamps of the printk()
+          messages to be added to the output of the syslog() system
+          call and at the console.
+
+          The timestamp is always recorded internally, and exported
+          to /dev/kmsg. This flag just specifies if the timestamp should
+          be included, not that the timestamp is recorded.
+
+          The behavior is also controlled by the kernel command line
+          parameter printk.time=1. See Documentation/kernel-parameters.txt
 
 config DEFAULT_MESSAGE_LOGLEVEL
         int "Default message log level (1-7)"
@@ -1205,8 +1209,13 @@ config DYNAMIC_DEBUG
           otherwise be available at runtime. These messages can then be
           enabled/disabled based on various levels of scope - per source file,
           function, module, format string, and line number. This mechanism
-          implicitly enables all pr_debug() and dev_dbg() calls. The impact of
-          this compile option is a larger kernel text size of about 2%.
+          implicitly compiles in all pr_debug() and dev_dbg() calls, which
+          enlarges the kernel text size by about 2%.
+
+          If a source file is compiled with DEBUG flag set, any
+          pr_debug() calls in it are enabled by default, but can be
+          disabled at runtime as below.  Note that DEBUG flag is
+          turned on by many CONFIG_*DEBUG* options.
 
           Usage:
 
@@ -1223,16 +1232,16 @@ config DYNAMIC_DEBUG
           lineno : line number of the debug statement
           module : module that contains the debug statement
           function : function that contains the debug statement
-          flags : 'p' means the line is turned 'on' for printing
+          flags : '=p' means the line is turned 'on' for printing
           format : the format used for the debug statement
 
           From a live system:
 
                 nullarbor:~ # cat <debugfs>/dynamic_debug/control
                 # filename:lineno [module]function flags format
-                fs/aio.c:222 [aio]__put_ioctx - "__put_ioctx:\040freeing\040%p\012"
-                fs/aio.c:248 [aio]ioctx_alloc - "ENOMEM:\040nr_events\040too\040high\012"
-                fs/aio.c:1770 [aio]sys_io_cancel - "calling\040cancel\012"
+                fs/aio.c:222 [aio]__put_ioctx =_ "__put_ioctx:\040freeing\040%p\012"
+                fs/aio.c:248 [aio]ioctx_alloc =_ "ENOMEM:\040nr_events\040too\040high\012"
+                fs/aio.c:1770 [aio]sys_io_cancel =_ "calling\040cancel\012"
 
           Example usage:
 
diff --git a/lib/Makefile b/lib/Makefile
index 18515f0267c4..74290c9e2864 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -123,6 +123,8 @@ obj-$(CONFIG_SIGNATURE) += digsig.o
 
 obj-$(CONFIG_CLZ_TAB) += clz_tab.o
 
+obj-$(CONFIG_DDR) += jedec_ddr_data.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 310c753cf83e..7ca29a0a3019 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -107,20 +107,22 @@ static char *ddebug_describe_flags(struct _ddebug *dp, char *buf,
         return buf;
 }
 
-#define vpr_info_dq(q, msg)                                             \
-do {                                                                    \
-        if (verbose)                                                    \
-                /* trim last char off format print */                   \
-                pr_info("%s: func=\"%s\" file=\"%s\" "                  \
-                        "module=\"%s\" format=\"%.*s\" "                \
-                        "lineno=%u-%u",                                 \
-                        msg,                                            \
-                        q->function ? q->function : "",                 \
-                        q->filename ? q->filename : "",                 \
-                        q->module ? q->module : "",                     \
-                        (int)(q->format ? strlen(q->format) - 1 : 0),   \
-                        q->format ? q->format : "",                     \
-                        q->first_lineno, q->last_lineno);               \
+#define vpr_info(fmt, ...) \
+        if (verbose) do { pr_info(fmt, ##__VA_ARGS__); } while (0)
+
+#define vpr_info_dq(q, msg)                                     \
+do {                                                            \
+        /* trim last char off format print */                   \
+        vpr_info("%s: func=\"%s\" file=\"%s\" "                 \
+                "module=\"%s\" format=\"%.*s\" "                \
+                "lineno=%u-%u",                                 \
+                msg,                                            \
+                q->function ? q->function : "",                 \
+                q->filename ? q->filename : "",                 \
+                q->module ? q->module : "",                     \
+                (int)(q->format ? strlen(q->format) - 1 : 0),   \
+                q->format ? q->format : "",                     \
+                q->first_lineno, q->last_lineno);               \
 } while (0)
 
 /*
@@ -180,12 +182,11 @@ static int ddebug_change(const struct ddebug_query *query,
                         if (newflags == dp->flags)
                                 continue;
                         dp->flags = newflags;
-                        if (verbose)
-                                pr_info("changed %s:%d [%s]%s =%s\n",
-                                        trim_prefix(dp->filename), dp->lineno,
-                                        dt->mod_name, dp->function,
-                                        ddebug_describe_flags(dp, flagbuf,
-                                                        sizeof(flagbuf)));
+                        vpr_info("changed %s:%d [%s]%s =%s\n",
+                                trim_prefix(dp->filename), dp->lineno,
+                                dt->mod_name, dp->function,
+                                ddebug_describe_flags(dp, flagbuf,
+                                                sizeof(flagbuf)));
                 }
         }
         mutex_unlock(&ddebug_lock);
@@ -337,7 +338,7 @@ static int check_set(const char **dest, char *src, char *name)
  * Returns 0 on success, <0 on error.
  */
 static int ddebug_parse_query(char *words[], int nwords,
-                               struct ddebug_query *query)
+                        struct ddebug_query *query, const char *modname)
 {
         unsigned int i;
         int rc;
@@ -347,6 +348,10 @@ static int ddebug_parse_query(char *words[], int nwords,
                 return -EINVAL;
         memset(query, 0, sizeof(*query));
 
+        if (modname)
+                /* support $modname.dyndbg=<multiple queries> */
+                query->module = modname;
+
         for (i = 0 ; i < nwords ; i += 2) {