Merge 4.5-rc4 into usb-next

We want the USB fixes in here as well.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index dda9e6742950..202df6cffcca 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -126,6 +126,13 @@ check_stack(unsigned long ip, unsigned long *stack)
         }
 
         /*
+         * Some archs may not have the passed in ip in the dump.
+         * If that happens, we need to show everything.
+         */
+        if (i == stack_trace_max.nr_entries)
+                i = 0;
+
+        /*
          * Now find where in the stack these are.
          */
         x = 0;