Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

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

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/ratelimit.c b/lib/ratelimit.c
index 08f8043cac61..d01f47135239 100644
--- a/lib/ratelimit.c
+++ b/lib/ratelimit.c
@@ -48,7 +48,9 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func)
         if (time_is_before_jiffies(rs->begin + rs->interval)) {
                 if (rs->missed) {
                         if (!(rs->flags & RATELIMIT_MSG_ON_RELEASE)) {
-                                pr_warn("%s: %d callbacks suppressed\n", func, rs->missed);
+                                printk_deferred(KERN_WARNING
+                                                "%s: %d callbacks suppressed\n",
+                                                func, rs->missed);
                                 rs->missed = 0;
                         }
                 }