Merge drm-upstream/drm-next into drm-misc-next

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 944418da9fe3..0f6dcb4011a8 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
                 goto out;
         }
 
-        /* There will be a line like so:
-                deps_drivers/net/dummy.o := \
-                  drivers/net/dummy.c \
-                    $(wildcard include/config/net/fastroute.h) \
-                  include/linux/module.h \
-
-           Sum all files in the same dir or subdirs.
-        */
+        /* Sum all files in the same dir or subdirs. */
         while ((line = get_next_line(&pos, file, flen)) != NULL) {
                 char* p = line;