Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64

Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index b9087bff008b..d84beb994f36 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -264,7 +264,7 @@ static struct dma_debug_entry *__hash_bucket_find(struct hash_bucket *bucket,
                                                   match_fn match)
 {
         struct dma_debug_entry *entry, *ret = NULL;
-        int matches = 0, match_lvl, last_lvl = 0;
+        int matches = 0, match_lvl, last_lvl = -1;
 
         list_for_each_entry(entry, &bucket->list, list) {
                 if (!match(ref, entry))
@@ -293,7 +293,7 @@ static struct dma_debug_entry *__hash_bucket_find(struct hash_bucket *bucket,
                 } else if (match_lvl > last_lvl) {
                         /*
                          * We found an entry that fits better then the
-                         * previous one
+                         * previous one or it is the 1st match.
                          */
                         last_lvl = match_lvl;
                         ret      = entry;