[hardknott][PATCH 0/9] Patch review request

[hardknott][PATCH 0/9] Patch review request

[Anuj Mittal]

Please review these changes for hardknott. Buils cleanly on autobuilder
except for intermittent valgrind ptest failures and a parselog failure
while testing qemuppc-alt.

Thanks,

Anuj

The following changes since commit 9ba6c42c1cc0ffb690126aa93ccb529405473af5:

  glibc: Fix CVE-2021-38604 (2021-08-25 10:44:50 +0800)

are available in the Git repository at:

  git://push.openembedded.org/openembedded-core-contrib anujm/hardknott

Alexander Kanavin (2):
  tcf-agent: fetching over git:// no longer works
  linux-firmware: upgrade 20210511 -> 20210818

Bruce Ashfield (2):
  linux-yocto/5.4: update to v5.4.141
  linux-yocto/5.4: update to v5.4.142

Changqing Li (1):
  file: fix close_on_exec for multithreaded decompression

Joe Slater (1):
  icu: increase pkgdata command buffer size

Khem Raj (1):
  weston: Re-order gbm destruction at DRM-backend tear down

Marek Vasut (1):
  image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior

Randy MacLeod (1):
  openssl: upgrade from 1.1.1k to 1.1.1l

 meta/classes/image_types.bbclass              |   2 +-
 .../{openssl_1.1.1k.bb => openssl_1.1.1l.bb}  |   2 +-
 meta/recipes-devtools/file/file_5.39.bb       |   3 +-
 ...ec-multithreaded-decompression-issue.patch | 220 ++++++++++++++++++
 .../tcf-agent/tcf-agent_git.bb                |   2 +-
 ...d-drm-Re-order-gbm-destruction-at-DR.patch |  50 ++++
 meta/recipes-graphics/wayland/weston_9.0.0.bb |   1 +
 ...20210511.bb => linux-firmware_20210818.bb} |   6 +-
 .../linux/linux-yocto-rt_5.4.bb               |   6 +-
 .../linux/linux-yocto-tiny_5.4.bb             |   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  |  22 +-
 ...pkgdata-increase-command-buffer-size.patch |  46 ++++
 meta/recipes-support/icu/icu_68.2.bb          |   1 +
 13 files changed, 344 insertions(+), 25 deletions(-)
 rename meta/recipes-connectivity/openssl/{openssl_1.1.1k.bb => openssl_1.1.1l.bb} (98%)
 create mode 100644 meta/recipes-devtools/file/files/0001-Fix-close_on_exec-multithreaded-decompression-issue.patch
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210511.bb => linux-firmware_20210818.bb} (99%)
 create mode 100644 meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch

-- 
2.31.1

[hardknott][PATCH 1/9] icu: increase pkgdata command buffer size

[Anuj Mittal]

From: Joe Slater <joe.slater@windriver.com>

Mitigate pathname truncation when installing in a project
with a very long pathname.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...pkgdata-increase-command-buffer-size.patch | 46 +++++++++++++++++++
 meta/recipes-support/icu/icu_68.2.bb          |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch

diff --git a/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch b/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch
new file mode 100644
index 0000000000..a5483568bb
--- /dev/null
+++ b/meta/recipes-support/icu/icu/0001-pkgdata-increase-command-buffer-size.patch
@@ -0,0 +1,46 @@
+From ab6b1acdeed76899f8227c38ab7e7675c7673ff1 Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Thu, 5 Aug 2021 09:23:48 -0700
+Subject: [PATCH 1/1] pkgdata: increase command buffer size
+
+Make cmd LARGE_BUFFER_SIZE to avoid pathname truncation
+when install paths are longer than about 150 characters.
+
+https://unicode-org.atlassian.net/browse/ICU-21702 has been
+created to address this issue and error reporting.
+
+Upstream-Status: Submitted [ICU-21702 opened]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+---
+ source/tools/pkgdata/pkgdata.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp
+index 5ab682e..d4b70ef 100644
+--- a/tools/pkgdata/pkgdata.cpp
++++ b/tools/pkgdata/pkgdata.cpp
+@@ -1131,17 +1131,17 @@ normal_symlink_mode:
+ 
+ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
+     int32_t result = 0;
+-    char cmd[SMALL_BUFFER_MAX_SIZE];
++    char cmd[LARGE_BUFFER_MAX_SIZE];
+ 
+     auto ret = snprintf(cmd,
+-            SMALL_BUFFER_MAX_SIZE,
++            LARGE_BUFFER_MAX_SIZE,
+             "cd %s && %s %s %s%s%s",
+             targetDir,
+             pkgDataFlags[INSTALL_CMD],
+             libFileNames[LIB_FILE_VERSION],
+             installDir, PKGDATA_FILE_SEP_STRING, libFileNames[LIB_FILE_VERSION]);
+     (void)ret;
+-    U_ASSERT(0 <= ret && ret < SMALL_BUFFER_MAX_SIZE);
++    U_ASSERT(0 <= ret && ret < LARGE_BUFFER_MAX_SIZE);
+ 
+     result = runCommand(cmd);
+ 
+-- 
+2.29.2
+
diff --git a/meta/recipes-support/icu/icu_68.2.bb b/meta/recipes-support/icu/icu_68.2.bb
index 1ca87feee4..130212d245 100644
--- a/meta/recipes-support/icu/icu_68.2.bb
+++ b/meta/recipes-support/icu/icu_68.2.bb
@@ -107,6 +107,7 @@ SRC_URI = "${BASE_SRC_URI};name=code \
            file://filter.json \
            file://fix-install-manx.patch \
            file://0001-icu-Added-armeb-support.patch \
+           file://0001-pkgdata-increase-command-buffer-size.patch \
            "
 
 SRC_URI_append_class-target = "\
-- 
2.31.1

[hardknott][PATCH 2/9] openssl: upgrade from 1.1.1k to 1.1.1l

[Anuj Mittal]

From: Randy MacLeod <randy.macleod@windriver.com>

Includes fixes for:

CVE: CVE-2021-3711
CVE: CVE-2021-3712

as described by:
   https://www.openssl.org/news/secadv/20210824.txt

Ptest results on qemux86-64 with kvm:
   All tests successful.
   Files=158, Tests=2532, 93 wallclock secs \
     ( 1.31 usr  0.14 sys + 73.43 cusr 12.65 csys = 87.53 CPU)
   Result: PASS
   DURATION: 93

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../openssl/{openssl_1.1.1k.bb => openssl_1.1.1l.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/openssl/{openssl_1.1.1k.bb => openssl_1.1.1l.bb} (98%)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
similarity index 98%
rename from meta/recipes-connectivity/openssl/openssl_1.1.1k.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
index e518cb6a02..9ea5c4c81f 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
@@ -28,7 +28,7 @@ SRC_URI_append_riscv32 = " \
            file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \
            "
 
-SRC_URI[sha256sum] = "892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"
+SRC_URI[sha256sum] = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"
 
 inherit lib_package multilib_header multilib_script ptest
 MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
-- 
2.31.1

[hardknott][PATCH 3/9] file: fix close_on_exec for multithreaded decompression

[Anuj Mittal]

From: Changqing Li <changqing.li@windriver.com>

It is not safe to call the 'file' command from multiple threads. When a
file is checked with multiple threads in parallel, the file descriptors
might get shared which makes the pipe handling lock up, leading to lock
up in rpmbuild. And may lead to rarely deadlock on random recipes's
do_package task.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-devtools/file/file_5.39.bb       |   3 +-
 ...ec-multithreaded-decompression-issue.patch | 220 ++++++++++++++++++
 2 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/file/files/0001-Fix-close_on_exec-multithreaded-decompression-issue.patch

diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.39.bb
index abaa8149a3..c0c7253688 100644
--- a/meta/recipes-devtools/file/file_5.39.bb
+++ b/meta/recipes-devtools/file/file_5.39.bb
@@ -12,7 +12,8 @@ DEPENDS = "file-replacement-native"
 DEPENDS_class-native = "bzip2-replacement-native"
 
 SRC_URI = "git://github.com/file/file.git \
-           file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch"
+           file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch \
+           file://0001-Fix-close_on_exec-multithreaded-decompression-issue.patch"
 
 SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/file/files/0001-Fix-close_on_exec-multithreaded-decompression-issue.patch b/meta/recipes-devtools/file/files/0001-Fix-close_on_exec-multithreaded-decompression-issue.patch
new file mode 100644
index 0000000000..42105feed9
--- /dev/null
+++ b/meta/recipes-devtools/file/files/0001-Fix-close_on_exec-multithreaded-decompression-issue.patch
@@ -0,0 +1,220 @@
+From 0d82f2f3ba4a856504f23a9db1dd5f37bd076337 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 23 Aug 2021 14:16:53 +0800
+Subject: [PATCH] Fix close_on_exec multithreaded decompression issue.
+
+Upstream-Status: Backport [https://github.com/file/file/commit/81f15c2b0d6e9eaf524ff7bab37426c21af75fb7]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ ChangeLog      |  5 +++++
+ configure.ac   |  2 +-
+ src/compress.c | 25 ++++++++++++++++++++++---
+ src/file.h     | 12 +++++++++++-
+ src/funcs.c    | 24 +++++++++++++++++++++++-
+ src/magic.c    |  7 +++++--
+ 6 files changed, 67 insertions(+), 8 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f877ad22..8c4a43d4 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2020-12-08  16:24  Christos Zoulas <christos@zoulas.com>
++
++	* fix multithreaded decompression file descriptor issue
++	  by using close-on-exec (Denys Vlasenko)
++
+ 2020-06-14  20:02  Christos Zoulas <christos@zoulas.com>
+ 
+ 	* release 5.39
+diff --git a/configure.ac b/configure.ac
+index 64c9f42e..521dc12d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,7 +166,7 @@ else
+ fi])
+ 
+ dnl Checks for functions
+-AC_CHECK_FUNCS(strndup mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale memmem)
++AC_CHECK_FUNCS(strndup mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale memmem pipe2)
+ 
+ dnl Provide implementation of some required functions if necessary
+ AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r localtime_r gmtime_r pread strcasestr fmtcheck dprintf)
+diff --git a/src/compress.c b/src/compress.c
+index 9670b72c..9f65e4fa 100644
+--- a/src/compress.c
++++ b/src/compress.c
+@@ -35,7 +35,7 @@
+ #include "file.h"
+ 
+ #ifndef lint
+-FILE_RCSID("@(#)$File: compress.c,v 1.127 2020/05/31 00:11:06 christos Exp $")
++FILE_RCSID("@(#)$File: compress.c,v 1.129 2020/12/08 21:26:00 christos Exp $")
+ #endif
+ 
+ #include "magic.h"
+@@ -844,8 +844,23 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, const unsigned char *old,
+ 	for (i = 0; i < __arraycount(fdp); i++)
+ 		fdp[i][0] = fdp[i][1] = -1;
+ 
+-	if ((fd == -1 && pipe(fdp[STDIN_FILENO]) == -1) ||
+-	    pipe(fdp[STDOUT_FILENO]) == -1 || pipe(fdp[STDERR_FILENO]) == -1) {
++	/*
++	 * There are multithreaded users who run magic_file()
++	 * from dozens of threads. If two parallel magic_file() calls
++	 * analyze two large compressed files, both will spawn
++	 * an uncompressing child here, which writes out uncompressed data.
++	 * We read some portion, then close the pipe, then waitpid() the child.
++	 * If uncompressed data is larger, child shound get EPIPE and exit.
++	 * However, with *parallel* calls OTHER child may unintentionally
++	 * inherit pipe fds, thus keeping pipe open and making writes in
++	 * our child block instead of failing with EPIPE!
++	 * (For the bug to occur, two threads must mutually inherit their pipes,
++	 * and both must have large outputs. Thus it happens not that often).
++	 * To avoid this, be sure to create pipes with O_CLOEXEC.
++	 */
++	if ((fd == -1 && file_pipe_closexec(fdp[STDIN_FILENO]) == -1) ||
++	    file_pipe_closexec(fdp[STDOUT_FILENO]) == -1 ||
++	    file_pipe_closexec(fdp[STDERR_FILENO]) == -1) {
+ 		closep(fdp[STDIN_FILENO]);
+ 		closep(fdp[STDOUT_FILENO]);
+ 		return makeerror(newch, n, "Cannot create pipe, %s",
+@@ -876,16 +891,20 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, const unsigned char *old,
+ 			if (fdp[STDIN_FILENO][1] > 2)
+ 				(void) close(fdp[STDIN_FILENO][1]);
+ 		}
++		file_clear_closexec(STDIN_FILENO);
++
+ ///FIXME: if one of the fdp[i][j] is 0 or 1, this can bomb spectacularly
+ 		if (copydesc(STDOUT_FILENO, fdp[STDOUT_FILENO][1]))
+ 			(void) close(fdp[STDOUT_FILENO][1]);
+ 		if (fdp[STDOUT_FILENO][0] > 2)
+ 			(void) close(fdp[STDOUT_FILENO][0]);
++		file_clear_closexec(STDOUT_FILENO);
+ 
+ 		if (copydesc(STDERR_FILENO, fdp[STDERR_FILENO][1]))
+ 			(void) close(fdp[STDERR_FILENO][1]);
+ 		if (fdp[STDERR_FILENO][0] > 2)
+ 			(void) close(fdp[STDERR_FILENO][0]);
++		file_clear_closexec(STDERR_FILENO);
+ 
+ 		(void)execvp(compr[method].argv[0],
+ 		    RCAST(char *const *, RCAST(intptr_t, compr[method].argv)));
+diff --git a/src/file.h b/src/file.h
+index 28ebc0c1..48f4b698 100644
+--- a/src/file.h
++++ b/src/file.h
+@@ -27,7 +27,7 @@
+  */
+ /*
+  * file.h - definitions for file(1) program
+- * @(#)$File: file.h,v 1.220 2020/06/08 17:38:27 christos Exp $
++ * @(#)$File: file.h,v 1.223 2020/12/08 21:26:00 christos Exp $
+  */
+ 
+ #ifndef __file_h__
+@@ -143,6 +143,14 @@
+ #define	MAX(a,b)	(((a) > (b)) ? (a) : (b))
+ #endif
+ 
++#ifndef O_CLOEXEC
++# define O_CLOEXEC 0
++#endif
++
++#ifndef FD_CLOEXEC
++# define FD_CLOEXEC 1
++#endif
++
+ #define FILE_BADSIZE CAST(size_t, ~0ul)
+ #define MAXDESC	64		/* max len of text description/MIME type */
+ #define MAXMIME	80		/* max len of text MIME type */
+@@ -538,6 +546,8 @@ protected char * file_printable(char *, size_t, const char *, size_t);
+ protected int file_os2_apptype(struct magic_set *, const char *, const void *,
+     size_t);
+ #endif /* __EMX__ */
++protected int file_pipe_closexec(int *);
++protected int file_clear_closexec(int);
+ 
+ protected void buffer_init(struct buffer *, int, const struct stat *,
+     const void *, size_t);
+diff --git a/src/funcs.c b/src/funcs.c
+index b66510c6..d6c485fe 100644
+--- a/src/funcs.c
++++ b/src/funcs.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: funcs.c,v 1.115 2020/02/20 15:50:20 christos Exp $")
++FILE_RCSID("@(#)$File: funcs.c,v 1.118 2020/12/08 21:26:00 christos Exp $")
+ #endif	/* lint */
+ 
+ #include "magic.h"
+@@ -36,6 +36,9 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.115 2020/02/20 15:50:20 christos Exp $")
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>	/* for pipe2() */
++#endif
+ #if defined(HAVE_WCHAR_H)
+ #include <wchar.h>
+ #endif
+@@ -783,3 +786,22 @@ file_print_guid(char *str, size_t len, const uint64_t *guid)
+ 	    g->data4[2], g->data4[3], g->data4[4], g->data4[5],
+ 	    g->data4[6], g->data4[7]);
+ }
++
++protected int
++file_pipe_closexec(int *fds)
++{
++#ifdef HAVE_PIPE2
++	return pipe2(fds, O_CLOEXEC);
++#else
++	if (pipe(fds) == -1)
++		return -1;
++	(void)fcntl(fds[0], F_SETFD, FD_CLOEXEC);
++	(void)fcntl(fds[1], F_SETFD, FD_CLOEXEC);
++	return 0;
++#endif
++}
++
++protected int
++file_clear_closexec(int fd) {
++	return fcntl(fd, F_SETFD, 0);
++}
+diff --git a/src/magic.c b/src/magic.c
+index 17a7077d..89f4e16c 100644
+--- a/src/magic.c
++++ b/src/magic.c
+@@ -33,7 +33,7 @@
+ #include "file.h"
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: magic.c,v 1.112 2020/06/08 19:44:10 christos Exp $")
++FILE_RCSID("@(#)$File: magic.c,v 1.113 2020/12/08 21:26:00 christos Exp $")
+ #endif	/* lint */
+ 
+ #include "magic.h"
+@@ -436,7 +436,7 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
+ 		_setmode(STDIN_FILENO, O_BINARY);
+ #endif
+ 	if (inname != NULL) {
+-		int flags = O_RDONLY|O_BINARY|O_NONBLOCK;
++		int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC;
+ 		errno = 0;
+ 		if ((fd = open(inname, flags)) < 0) {
+ 			okstat = stat(inname, &sb) == 0;
+@@ -460,6 +460,9 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
+ 			rv = 0;
+ 			goto done;
+ 		}
++#if O_CLOEXEC == 0
++		(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
++#endif
+ 	}
+ 
+ 	if (fd != -1) {
+-- 
+2.17.1
+
-- 
2.31.1

[hardknott][PATCH 4/9] weston: Re-order gbm destruction at DRM-backend tear down

[Anuj Mittal]

From: Khem Raj <raj.khem@gmail.com>

Fixes an annoying segfault seen on rpi4 when launching weston during
boot especially using systemd service or sysvinit script, if weston is
launched manually on VT, it works fine. This backport specifically
addresses the issue described above.

For more details see [1]

[1] https://gitlab.freedesktop.org/wayland/weston/-/issues/314

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 74e0249af85782af436791d1339ce864536d2022)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...d-drm-Re-order-gbm-destruction-at-DR.patch | 50 +++++++++++++++++++
 meta/recipes-graphics/wayland/weston_9.0.0.bb |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch

diff --git a/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch b/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
new file mode 100644
index 0000000000..f8f7589499
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch
@@ -0,0 +1,50 @@
+From c8bfa1f8d576cdc6d515dbbac36c48c6166be0d5 Mon Sep 17 00:00:00 2001
+From: Marius Vlad <marius.vlad@collabora.com>
+Date: Thu, 1 Apr 2021 00:12:00 +0300
+Subject: [PATCH] libweston/backend-drm: Re-order gbm destruction at DRM-backend tear down
+
+Tearing down the drm-backend when there are no input devices, would call
+for the gbm device destruction before compositor shutdown. The latter
+would call into the renderer detroy function and assume that the
+EGLDisplay, which was created using the before-mentioned gbm device, is
+still available. This patch re-orders the gbm destruction after the
+compositor shutdown when no one would make use of it.
+
+Fixes: #314
+
+Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
+Suggested-by: Daniel Stone <daniel.stone@collabora.com>
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/d171c7b3ba346c4d0bd6494f45ebf0be3c3cc5fb]
+---
+ libweston/backend-drm/drm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
+index 2780f3b..fbcfeca 100644
+--- a/libweston/backend-drm/drm.c
++++ b/libweston/backend-drm/drm.c
+@@ -3025,10 +3025,6 @@ err_drm_source:
+ err_udev_input:
+ 	udev_input_destroy(&b->input);
+ err_sprite:
+-#ifdef BUILD_DRM_GBM
+-	if (b->gbm)
+-		gbm_device_destroy(b->gbm);
+-#endif
+ 	destroy_sprites(b);
+ err_udev_dev:
+ 	udev_device_unref(drm_device);
+@@ -3038,6 +3034,10 @@ err_launcher:
+ 	weston_launcher_destroy(compositor->launcher);
+ err_compositor:
+ 	weston_compositor_shutdown(compositor);
++#ifdef BUILD_DRM_GBM
++	if (b->gbm)
++		gbm_device_destroy(b->gbm);
++#endif
+ 	free(b);
+ 	return NULL;
+ }
+--
+2.33.0
diff --git a/meta/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_9.0.0.bb
index bcbac06d58..ef12cb8c85 100644
--- a/meta/recipes-graphics/wayland/weston_9.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_9.0.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
            file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \
            file://0001-meson.build-fix-incorrect-header.patch \
+           file://0001-libweston-backend-drm-Re-order-gbm-destruction-at-DR.patch \
 "
 
 SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch "
-- 
2.31.1

[hardknott][PATCH 5/9] tcf-agent: fetching over git:// no longer works

[Anuj Mittal]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 44a6cd03721b51cbb4e05870375fa347527b0db5)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index 854269a0fa..a143b09656 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -10,7 +10,7 @@ SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f"
 PV = "1.7.0+git${SRCPV}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
-SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \
+SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https \
            file://fix_ranlib.patch \
            file://ldflags.patch \
            file://tcf-agent.init \
-- 
2.31.1

[hardknott][PATCH 6/9] image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior

[Anuj Mittal]

From: Marek Vasut <marex@denx.de>

Currently the mkfs.btrfs generates large images with a lot of wasted
space. This happens since OE-core updated btrfs-tools from 4.13.3 to
4.15.1 in commit 94b645aa77 ("btrfs-tools: update to 4.15.1") .

Note in mkfs.btrfs(8) manpage section -r says the following:
"
  -r|--rootdir <rootdir>
...
       Note This option may enlarge the image or file to ensure
       it’s big enough to contain the files from rootdir. Since
       version 4.14.1 the filesystem size is not minimized. Please
       see option --shrink if you need that functionality.

  --shrink
     Shrink the filesystem to its minimal size, only works with
     --rootdir option.
...
       Note prior to version 4.14.1, the shrinking was done
       automatically.
"

Add the --shrink option to EXTRA_IMAGECMD_btrfs to reinstate the
original behavior and un-waste the space.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c4a99d36967302c176b62fad840b5e79486ea356)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8028691405..cee577d5da 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -225,7 +225,7 @@ EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLO
 EXTRA_IMAGECMD_ext2 ?= "-i 4096"
 EXTRA_IMAGECMD_ext3 ?= "-i 4096"
 EXTRA_IMAGECMD_ext4 ?= "-i 4096"
-EXTRA_IMAGECMD_btrfs ?= "-n 4096"
+EXTRA_IMAGECMD_btrfs ?= "-n 4096 --shrink"
 EXTRA_IMAGECMD_f2fs ?= ""
 
 do_image_cpio[depends] += "cpio-native:do_populate_sysroot"
-- 
2.31.1

[hardknott][PATCH 7/9] linux-firmware: upgrade 20210511 -> 20210818

[Anuj Mittal]

From: Alexander Kanavin <alex.kanavin@gmail.com>

License-Update: new firmware files, copyright years, file names
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bfceaba4f38771047dfdfdfdbf16b794006dfd78)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...inux-firmware_20210511.bb => linux-firmware_20210818.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210511.bb => linux-firmware_20210818.bb} (99%)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb
index 513932984e..7f6db18b69 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb
@@ -97,7 +97,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \
                     file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \
                     file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \
-                    file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \
+                    file://LICENCE.iwlwifi_firmware;md5=2ce6786e0fc11ac6e36b54bb9b799f1b \
                     file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \
                     file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \
                     file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
                     file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
                     file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
-                    file://WHENCE;md5=727d0d4e2d420f41d89d098f6322e779 \
+                    file://WHENCE;md5=15ad289bf2359e8ecf613f3b04f72fab \
                     "
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -205,7 +205,7 @@ PE = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "2aa6ae8b9808408f9811ac38f00c188e53e984a2b3990254f6c9c02c1ab13417"
+SRC_URI[sha256sum] = "bef3d317c348d962b3a1b95cb4e19ea4f282e18112b2c669cff74f9267ce3893"
 
 inherit allarch
 
-- 
2.31.1

[hardknott][PATCH 8/9] linux-yocto/5.4: update to v5.4.141

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:

    b704883aa8dc Linux 5.4.141
    983d6a6b7e3c btrfs: don't flush from btrfs_delayed_inode_reserve_metadata
    ea13f678a3fd btrfs: export and rename qgroup_reserve_meta
    41a9b8f36de7 btrfs: qgroup: don't commit transaction when we already hold the handle
    38b8485b72cb net: xilinx_emaclite: Do not print real IOMEM pointer
    654c19a7e8d8 btrfs: fix lockdep splat when enabling and disabling qgroups
    c55442cdfdb8 btrfs: qgroup: remove ASYNC_COMMIT mechanism in favor of reserve retry-after-EDQUOT
    fdaf6a322fcc btrfs: transaction: Cleanup unused TRANS_STATE_BLOCKED
    36af2de520cc btrfs: qgroup: try to flush qgroup space when we get -EDQUOT
    5c79287c2b6d btrfs: qgroup: allow to unreserve range without releasing other ranges
    b7a722fd75a1 btrfs: make btrfs_qgroup_reserve_data take btrfs_inode
    dfadea4061a2 btrfs: make qgroup_free_reserved_data take btrfs_inode
    812f39ed5b0b ovl: prevent private clone if bind mount is not allowed
    eeb4742501e0 ppp: Fix generating ppp unit id when ifname is not specified
    3460f3959d1c ALSA: hda: Add quirk for ASUS Flow x13
    81d1a3f97631 USB:ehci:fix Kunpeng920 ehci hardware problem
    d28adaabbbf4 KVM: X86: MMU: Use the correct inherited permissions to get shadow page
    5f4ab7e25fbb usb: dwc3: gadget: Avoid runtime resume if disabling pullup
    1782c4af6bd0 usb: dwc3: gadget: Disable gadget IRQ during pullup disable
    54b7022f2878 usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable
    e36245a68eb1 usb: dwc3: gadget: Prevent EP queuing while stopping transfers
    823f69250863 usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup
    25a0625fa96f usb: dwc3: gadget: Allow runtime suspend if UDC unbinded
    5f081a928d55 usb: dwc3: Stop active transfers before halting the controller
    396f29ea0cd2 tracing: Reject string operand in the histogram expression
    28276c280f2e media: v4l2-mem2mem: always consider OUTPUT queue during poll
    236aca70929d tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag
    5b774238e8af KVM: SVM: Fix off-by-one indexing when nullifying last used SEV VMCB
    a998faa9c4ce Linux 5.4.140
    3c197fdd0732 arm64: fix compat syscall return truncation
    72fcaf69525d net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset
    742e85fa9e80 alpha: Send stop IPI to send to online CPUs
    26946d21395c virt_wifi: fix error on connect
    17d7c9c940fb reiserfs: check directory items on read from disk
    bcad6ece2a50 reiserfs: add check for root_inode in reiserfs_fill_super
    e30a88f1f578 libata: fix ata_pio_sector for CONFIG_HIGHMEM
    a2671d96a3c7 bpf, selftests: Adjust few selftest result_unpriv outcomes
    4892b4f3244b perf/x86/amd: Don't touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest
    d6cf5342faa6 soc: ixp4xx/qmgr: fix invalid __iomem access
    a5bf7ef13ebf spi: meson-spicc: fix memory leak in meson_spicc_remove
    27991c78d630 soc: ixp4xx: fix printing resources
    07fd256d53a3 arm64: vdso: Avoid ISB after reading from cntvct_el0
    90e498ef3f54 KVM: x86/mmu: Fix per-cpu counter corruption on 32-bit builds
    2e1a80b93464 KVM: Do not leak memory for duplicate debugfs directories
    43486cd7391f KVM: x86: accept userspace interrupt only if no event is injected
    1b7b9713a50f md/raid10: properly indicate failure when ending a failed write request
    790cb68d35a6 pcmcia: i82092: fix a null pointer dereference bug
    42ac2c63486f timers: Move clearing of base::timer_running under base:: Lock
    8211bb20da23 serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts.
    f73dcb5d63e2 serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated driver
    607460d38692 MIPS: Malta: Do not byte-swap accesses to the CBUS UART
    3eb686d01c31 serial: 8250: Mask out floating 16/32-bit bus bits
    3b73a69962d6 serial: 8250_mtk: fix uart corruption issue when rx power off
    afdef443a892 serial: tegra: Only print FIFO error message when an error occurs
    097a183f9c1d ext4: fix potential htree corruption when growing large_dir directories
    ac23a1738127 pipe: increase minimum default pipe size to 2 pages
    f3cae04bd42d media: rtl28xxu: fix zero-length control request
    e2f6d5b03898 staging: rtl8712: get rid of flush_scheduled_work
    8f241df0e68f staging: rtl8723bs: Fix a resource leak in sd_int_dpc
    bbdd4a51629a tpm_ftpm_tee: Free and unregister TEE shared memory during kexec
    3c712f14d8a9 optee: Fix memory leak when failing to register shm pages
    0572199b78b3 tee: add tee_shm_alloc_kernel_buf()
    b247bf412cc2 optee: Clear stale cache entries during initialization
    7da261e6bb65 tracing / histogram: Give calculation hist_fields a size
    ba22053f5d5e scripts/tracing: fix the bug that can't parse raw_trace_func
    8d1191f9243c clk: fix leak on devm_clk_bulk_get_all() unwind
    ed5c9a49e6c0 usb: otg-fsm: Fix hrtimer list corruption
    449a705fba60 usb: gadget: f_hid: idle uses the highest byte for duration
    02f336cee589 usb: gadget: f_hid: fixed NULL pointer dereference
    f780a9580cd2 usb: gadget: f_hid: added GET_IDLE and SET_IDLE handlers
    134e27da543d usb: cdns3: Fixed incorrect gadget state
    df1c6eec4ea1 ALSA: usb-audio: Add registration quirk for JBL Quantum 600
    639b45456ec6 ALSA: hda/realtek: add mic quirk for Acer SF314-42
    d09639528b66 firmware_loader: fix use-after-free in firmware_fallback_sysfs
    1deb6b903018 firmware_loader: use -ETIMEDOUT instead of -EAGAIN in fw_load_sysfs_fallback
    0ee687e67277 USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2
    01b2c35b051b USB: serial: ch341: fix character loss at high transfer rates
    9ed43cfaa7f7 USB: serial: option: add Telit FD980 composition 0x1056
    518e81874c40 USB: usbtmc: Fix RCU stall warning
    ff29fe26ab86 Bluetooth: defer cleanup of resources in hci_unregister_dev()
    580c10a40cc7 blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()
    ed169b054b43 net: vxge: fix use-after-free in vxge_device_unregister
    c5549876a9ef net: fec: fix use-after-free in fec_drv_remove
    3fed6dee16e4 net: pegasus: fix uninit-value in get_interrupt_interval
    75cef4fc07d2 bnx2x: fix an error code in bnx2x_nic_load()
    437ee90d7b4f mips: Fix non-POSIX regexp
    b1fa6747b9d0 net: ipv6: fix returned variable type in ip6_skb_dst_mtu
    3e63b566d96a nfp: update ethtool reporting of pauseframe control
    d333503de1f0 sctp: move the active_key update after sh_keys is added
    de30346dd396 gpio: tqmx86: really make IRQ optional
    9d440b5c1d20 net: natsemi: Fix missing pci_disable_device() in probe and remove
    69340406986a net: phy: micrel: Fix detection of ksz87xx switch
    2b8ab7aec0dc net: dsa: sja1105: invalidate dynamic FDB entries learned concurrently with statically added ones
    71b0a935dbb0 net: dsa: sja1105: overwrite dynamic FDB entries with static ones in .port_fdb_add
    88b7781609c6 net, gro: Set inner transport header offset in tcp/udp GRO hook
    ba3abe3f8236 dmaengine: imx-dma: configure the generic DMA type to make it work
    ee2f81330a7b media: videobuf2-core: dequeue if start_streaming fails
    3377f2f8c606 scsi: sr: Return correct event when media event code is 3
    f588d4b7be92 spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation
    b58e3d59a5d8 spi: imx: mx51-ecspi: Reinstate low-speed CONFIGREG delay
    2c1065d40acb omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator
    299e3968c01a ARM: dts: am437x-l4: fix typo in can@0 node
    9cbe7e21ddff clk: stm32f4: fix post divisor setup for I2S/SAI PLLs
    3f9eed4462b3 ALSA: usb-audio: fix incorrect clock source setting
    16db40fc4a37 arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode
    7c08460773b8 ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins
    1b1f1aa225ed ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init
    aecff98c3efe ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz
    c39907335b9c ARM: dts: imx6qdl-sr-som: Increase the PHY reset duration to 10ms
    61b71c5f51aa ARM: imx: add missing clk_disable_unprepare()
    d88d6bba3bd9 ARM: imx: add missing iounmap()
    6c629cd0239f arm64: dts: ls1028a: fix node name for the sysclk
    4a830a37d37e ALSA: seq: Fix racy deletion of subscriber
    0658a4533576 Revert "ACPICA: Fix memory leak caused by _CID repair function"
    e350cd02e293 Linux 5.4.139
    03ff8a4f9db6 spi: mediatek: Fix fifo transfer
    a0f66ddf05c2 bpf, selftests: Adjust few selftest outcomes wrt unreachable code
    d3796e8f6b3d bpf, selftests: Add a verifier test for assigning 32bit reg states to 64bit ones
    8dec99abcd74 bpf: Test_verifier, add alu32 bounds tracking tests
    fd568de5806f bpf: Fix leakage under speculation on mispredicted branches
    d2f790327f83 bpf: Do not mark insn as seen under speculative path verification
    283d742988f6 bpf: Inherit expanded/patched seen count from old aux data
    a0a9546aaec3 Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout"
    76f5314d7859 firmware: arm_scmi: Add delayed response status check
    1b38f70bbc7c firmware: arm_scmi: Ensure drivers provide a probe function
    44f522298c94 Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled"
    38f54217b423 ACPI: fix NULL pointer dereference
    0ea2f55babb7 nvme: fix nvme_setup_command metadata trace event
    b508b652d4f3 net: Fix zero-copy head len calculation.
    bf692e7ef657 qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()
    6bc48348eca7 r8152: Fix potential PM refcount imbalance
    a57c75ff0700 ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits
    e2cccb839a18 spi: stm32h7: fix full duplex irq handler handling
    b72f2d9e91e1 regulator: rt5033: Fix n_voltages settings for BUCK and LDO
    86f2a3e9aae9 btrfs: fix lost inode on log replay after mix of fsync, rename and inode eviction
    b7f0fa2192c5 btrfs: fix race causing unnecessary inode logging during link and rename
    cb006da62a9e btrfs: do not commit logs and transactions during link and rename operations
    174c27d0f9ef btrfs: delete duplicated words + other fixes in comments
    7b90d57b09fa Linux 5.4.138
    7eef18c0479b can: j1939: j1939_session_deactivate(): clarify lifetime of session object
    18b536de3b97 i40e: Add additional info to PHY type error
    d21eb931109a Revert "perf map: Fix dso->nsinfo refcounting"
    16447b2f5c66 powerpc/pseries: Fix regression while building external modules
    265883d1d839 PCI: mvebu: Setup BAR0 in order to fix MSI
    21734a31c9a0 can: hi311x: fix a signedness bug in hi3110_cmd()
    f4fa45b0f91e sis900: Fix missing pci_disable_device() in probe and remove
    dff00ce44891 tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
    e0310bbeaaa2 sctp: fix return value check in __sctp_rcv_asconf_lookup
    408614108abd net/mlx5e: Fix nullptr in mlx5e_hairpin_get_mdev()
    ac4983230616 net/mlx5: Fix flow table chaining
    527feae56fe6 net: llc: fix skb_over_panic
    ede4c93860e6 mlx4: Fix missing error code in mlx4_load_one()
    acb97d4b2d0e net: Set true network header for ECN decapsulation
    851946a68136 tipc: fix sleeping in tipc accept routine
    194b71d28b26 i40e: Fix log TC creation failure when max num of queues is exceeded
    834af62212c7 i40e: Fix queue-to-TC mapping on Tx
    74aea4b7159a i40e: Fix firmware LLDP agent related warning
    b2ab34e862eb i40e: Fix logic of disabling queues
    519582e44e6a netfilter: nft_nat: allow to specify layer 4 protocol NAT only
    3a7a4cee7bec netfilter: conntrack: adjust stop timestamp to real expiry value
    1c043783403c cfg80211: Fix possible memory leak in function cfg80211_bss_update
    6cf2abea1018 nfc: nfcsim: fix use after free during module unload
    6b313d0ffa71 NIU: fix incorrect error return, missed in previous revert
    c4663c162778 HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT
    e9e2ce00aeda can: esd_usb2: fix memory leak
    43726620b2f6 can: ems_usb: fix memory leak
    819867389276 can: usb_8dev: fix memory leak
    a051dbd17b5b can: mcba_usb_start(): add missing urb->transfer_dma initialization
    793581441b5c can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF
    c621638d0e6d can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms
    a24d87b429a9 ocfs2: issue zeroout to EOF blocks
    eaaa4284e288 ocfs2: fix zero out valid data
    9bd1092148b5 KVM: add missing compat KVM_CLEAR_DIRTY_LOG
    7a94dfe5e2a0 x86/kvm: fix vcpu-id indexed array sizes
    2dc291582cce Revert "ACPI: resources: Add checks for ACPI IRQ override"
    a8eec6979734 btrfs: mark compressed range uptodate only if all bio succeed
    57429c1ec770 btrfs: fix rw device counting in __btrfs_free_extra_devids
    61f2cbc792eb x86/asm: Ensure asm/proto.h can be included stand-alone
    99372c38a948 net_sched: check error pointer in tcf_dump_walker()
    5b1de8e15f0f Linux 5.4.137
    ebb1b38be0c9 ipv6: ip6_finish_output2: set sk into newly allocated nskb
    6c04123962f0 ARM: dts: versatile: Fix up interrupt controller node names
    befa900533a9 iomap: remove the length variable in iomap_seek_hole
    83fb41b2f6e4 iomap: remove the length variable in iomap_seek_data
    302e1acd4c26 cifs: fix the out of range assignment to bit fields in parse_server_interfaces
    02a470e3c64a firmware: arm_scmi: Fix range check for the maximum number of pending messages
    289dd584319f firmware: arm_scmi: Fix possible scmi_linux_errmap buffer overflow
    e3acb292f092 hfs: add lock nesting notation to hfs_find_init
    af1178296d77 hfs: fix high memory mapping in hfs_bnode_read
    89136a47e2e7 hfs: add missing clean-up in hfs_fill_super
    ded37d03440d ipv6: allocate enough headroom in ip6_finish_output2()
    f65b7f377cca sctp: move 198 addresses from unusable to private scope
    c8d32973ee6a net: annotate data race around sk_ll_usec
    c23b9a5610f9 net/802/garp: fix memleak in garp_request_join()
    88c4cae3ed25 net/802/mrp: fix memleak in mrp_request_join()
    eef99860c677 cgroup1: fix leaked context root causing sporadic NULL deref in LTP
    7f0365b4daaa workqueue: fix UAF in pwq_unbound_release_workfn()
    85abe0d47fe6 af_unix: fix garbage collect vs MSG_PEEK
    af45f3527aa0 KVM: x86: determine if an exception has an error code only when injecting it.
    828cab3c8c23 tools: Allow proper CC/CXX/... override with LLVM=1 in Makefile.include
    525c5513b60d selftest: fix build error in tools/testing/selftests/vm/userfaultfd.c
    253dccefb5cb Linux 5.4.136
    587f86b7a2a0 xhci: add xhci_get_virt_ep() helper
    f9d0c35556cd perf inject: Close inject.output on exit
    a9c103fa91e4 PCI: Mark AMD Navi14 GPU ATS as broken
    11561d2f7b9d btrfs: compression: don't try to compress if we don't have enough pages
    4980301e1c1f iio: accel: bma180: Fix BMA25x bandwidth register values
    d04f2582c47e iio: accel: bma180: Use explicit member assignment
    4e0afa88954b net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear
    2a4865d1547e net: dsa: mv88e6xxx: use correct .stats_set_histogram() on Topaz
    7d8c06b8d2d2 drm: Return -ENOTTY for non-drm ioctls
    b5d7bebd96a3 nds32: fix up stack guard gap
    ba378b796088 rbd: always kick acquire on "acquired" and "released" notifications
    13066d6628f0 rbd: don't hold lock_rwsem while running_list is being drained
    b12ead825f6c hugetlbfs: fix mount mode command line processing
    60dbbd76f110 userfaultfd: do not untag user pointers
    540eee8cbb3d selftest: use mmap instead of posix_memalign to allocate memory
    e706ac3fc82e ixgbe: Fix packet corruption due to missing DMA sync
    e617fa62f6cf media: ngene: Fix out-of-bounds bug in ngene_command_config_free_buf()
    77713fb336ca btrfs: check for missing device in btrfs_trim_fs
    f899f24d34d9 tracing: Fix bug in rb_per_cpu_empty() that might cause deadloop.
    59a9f75fb2b6 tracing/histogram: Rename "cpu" to "common_cpu"
    379d8da3353e firmware/efi: Tell memblock about EFI iomem reservations
    281a94362bbe usb: dwc2: gadget: Fix sending zero length packet in DDMA mode.
    167079fbfaa7 USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
    811c4cdf2917 USB: serial: cp210x: fix comments for GE CS1000
    f54ee7e16d0d USB: serial: option: add support for u-blox LARA-R6 family
    e28d28eb9be6 usb: renesas_usbhs: Fix superfluous irqs happen after usb_pkt_pop()
    863d071dbcd5 usb: max-3421: Prevent corruption of freed memory
    e4077a90e600 USB: usb-storage: Add LaCie Rugged USB3-FW to IGNORE_UAS
    da6f6769ee0f usb: hub: Fix link power management max exit latency (MEL) calculations
    fea6b53e631a usb: hub: Disable USB 3 device initiated lpm if exit latency is too high
    962ce043ef92 KVM: PPC: Book3S HV Nested: Sanitise H_ENTER_NESTED TM state
    2b9ffddd70b4 KVM: PPC: Book3S: Fix H_RTAS rets buffer overflow
    c968f563ccde xhci: Fix lost USB 2 remote wake
    a660ecde5c55 ALSA: hdmi: Expose all pins on MSI MS-7C94 board
    f73696354d59 ALSA: sb: Fix potential ABBA deadlock in CSP driver
    7aa2dfbc6bd0 ALSA: usb-audio: Add registration quirk for JBL Quantum headsets
    46d62c3fe2ab ALSA: usb-audio: Add missing proc text entry for BESPOKEN type
    f1754f96ab41 s390/boot: fix use of expolines in the DMA code
    8eb521d19248 s390/ftrace: fix ftrace_update_ftrace_func implementation
    268132b070d9 Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
    f323809e3108 proc: Avoid mixing integer types in mem_rw()
    b71a75209f6a drm/panel: raspberrypi-touchscreen: Prevent double-free
    2e6ab87f8e63 net: sched: cls_api: Fix the the wrong parameter
    b60461696a0b sctp: update active_key for asoc when old key is being replaced
    9fa89c2caee2 nvme: set the PRACT bit when using Write Zeroes with T10 PI
    c50141b3d769 r8169: Avoid duplicate sysfs entry creation error
    f726817d6b42 afs: Fix tracepoint string placement with built-in AFS
    b22c9e433bb7 Revert "USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem"
    69a49e7b5baf nvme-pci: don't WARN_ON in nvme_reset_work if ctrl.state is not RESETTING
    830251361425 ipv6: fix another slab-out-of-bounds in fib6_nh_flush_exceptions
    a88414fb1117 net/sched: act_skbmod: Skip non-Ethernet packets
    c278b954ccc7 net: hns3: fix rx VLAN offload state inconsistent issue
    006ed6f4d00b net/tcp_fastopen: fix data races around tfo_active_disable_stamp
    3942ba235693 net: hisilicon: rename CACHE_LINE_MASK to avoid redefinition
    f11f12decd55 bnxt_en: Check abort error state in bnxt_half_open_nic()
    16ce6cb78690 bnxt_en: Add missing check for BNXT_STATE_ABORT_ERR in bnxt_fw_rset_task()
    c993e7aadc50 bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe()
    6ee8e6be3067 bnxt_en: Improve bnxt_ulp_stop()/bnxt_ulp_start() call sequence.
    35637acc9810 spi: cadence: Correct initialisation of runtime PM again
    2f2150bf41c1 scsi: target: Fix protect handling in WRITE SAME(32)
    a6cb717f8534 scsi: iscsi: Fix iface sysfs attr detection
    25df44e90ff5 netrom: Decrease sock refcount when sock timers expire
    8d7924ce85ba net: sched: fix memory leak in tcindex_partial_destroy_work
    f38527f18905 KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak
    b85dadd4347b KVM: PPC: Book3S: Fix CONFIG_TRANSACTIONAL_MEM=n crash
    b3224bd31861 net: decnet: Fix sleeping inside in af_decnet
    bd2b3b13aa2a efi/tpm: Differentiate missing and invalid final event log table.
    9413c0abb57f net: fix uninit-value in caif_seqpkt_sendmsg
    6d56299ff911 bpftool: Check malloc return value in mount_bpffs_for_pin
    edec10098675 bpf, sockmap, tcp: sk_prot needs inuse_idx set for proc stats
    58259e8b6e85 s390/bpf: Perform r1 range checking before accessing jit->seen_reg[r1]
    cc876a5618bc liquidio: Fix unintentional sign extension issue on left shift of u16
    42fe8f433b31 ASoC: rt5631: Fix regcache sync errors on resume
    d99aaf07365f spi: mediatek: fix fifo rx mode
    08cdda8d8972 regulator: hi6421: Fix getting wrong drvdata
    b25be6bf6419 regulator: hi6421: Use correct variable type for regmap api val argument
    a1ade24cccb5 spi: stm32: fixes pm_runtime calls in probe/remove
    40e203ce74eb spi: stm32: Use dma_request_chan() instead dma_request_slave_channel()
    24b78097a837 spi: imx: add a check for speed_hz before calculating the clock
    52cff6123aa0 perf data: Close all files in close_dir()
    0f63857d1099 perf probe-file: Delete namelist in del_events() on the error path
    8b92ea243bbf perf lzma: Close lzma stream on exit
    51351c6d5a18 perf script: Fix memory 'threads' and 'cpus' leaks on exit
    d2bfc3eda914 perf dso: Fix memory leak in dso__new_map()
    05804a7d223d perf test event_update: Fix memory leak of evlist
    d257f3abdc71 perf test session_topology: Delete session->evlist
    89d1762a4a21 perf env: Fix sibling_dies memory leak
    fd335143befb perf probe: Fix dso->nsinfo refcounting
    6513dee46f80 perf map: Fix dso->nsinfo refcounting
    ff9fc81fa884 nvme-pci: do not call nvme_dev_remove_admin from nvme_remove
    d029df83c61a cxgb4: fix IRQ free race during driver unload
    ae9b64434441 pwm: sprd: Ensure configuring period and duty_cycle isn't wrongly skipped
    a37ca2a076ec selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect
    05364a2794fb selftests: icmp_redirect: remove from checking for IPv6 route get
    7f4848229e91 ipv6: fix 'disable_policy' for fwd packets
    c67fb96f5431 gve: Fix an error handling path in 'gve_probe()'
    e33da4eeaa35 igb: Fix position of assignment to *ring
    7dd897773618 igb: Check if num of q_vectors is smaller than max before array access
    d3d7cceee841 iavf: Fix an error handling path in 'iavf_probe()'
    7a13a8a8a5fb e1000e: Fix an error handling path in 'e1000_probe()'
    9fc381db7583 fm10k: Fix an error handling path in 'fm10k_probe()'
    5d6a04927b08 igb: Fix an error handling path in 'igb_probe()'
    cddd53237de8 igc: Fix an error handling path in 'igc_probe()'
    47f69d8828e7 igc: Prefer to use the pci_release_mem_regions method
    83b2d55a512a ixgbe: Fix an error handling path in 'ixgbe_probe()'
    ba4fbb68fcfe igc: change default return of igc_read_phy_reg()
    88e0720133d4 igb: Fix use-after-free error during reset
    a9508e0edfe3 igc: Fix use-after-free error during reset

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index e810132d02..984859a88b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "0ad6f2204daf35fb25df5e9b52383507df813bb4"
-SRCREV_meta ?= "98ba88191b7c489bc0d83b6c87a31b2330fcd886"
+SRCREV_machine ?= "e823f31a48749bf1d01a86c274fcec87fae1e5ba"
+SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.4.139"
+LINUX_VERSION ?= "5.4.141"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index c734ce8db5..44a033d5cb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.4.139"
+LINUX_VERSION ?= "5.4.141"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "a80ea6be16b19c18855f831333c93d4f3b55e58a"
-SRCREV_machine ?= "405fce9e3f0314767e38b5e8295b34a24cd97a46"
-SRCREV_meta ?= "98ba88191b7c489bc0d83b6c87a31b2330fcd886"
+SRCREV_machine_qemuarm ?= "63d08f6ee3425e9d94eccf3a75a9ec4e474df916"
+SRCREV_machine ?= "05b2de44f781a297be454242d77f619189dfc6f4"
+SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index fcf65149f0..e80c1e69ae 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "3d243cfd29a57dfe6b04a6a6cf1b1088d107f1f6"
-SRCREV_machine_qemuarm64 ?= "dcac97a2b4469136189f86fe42703026693384be"
-SRCREV_machine_qemumips ?= "ee74231b68518107954078d03d0606910603cf7a"
-SRCREV_machine_qemuppc ?= "76c51679aa6b9c25fe2b5c2052e84197ff2e4e2d"
-SRCREV_machine_qemuriscv64 ?= "807b4668ff7fe3be031ace442a84d70821ef9571"
-SRCREV_machine_qemux86 ?= "807b4668ff7fe3be031ace442a84d70821ef9571"
-SRCREV_machine_qemux86-64 ?= "807b4668ff7fe3be031ace442a84d70821ef9571"
-SRCREV_machine_qemumips64 ?= "3396071f8ce8ca148231fee4d2130feeead41926"
-SRCREV_machine ?= "807b4668ff7fe3be031ace442a84d70821ef9571"
-SRCREV_meta ?= "98ba88191b7c489bc0d83b6c87a31b2330fcd886"
+SRCREV_machine_qemuarm ?= "91a35a54a7b2d4d558b3f8b24c39657a3ff71c7c"
+SRCREV_machine_qemuarm64 ?= "a8edc7f1b004c6fb56d142fba3e688ba2a051b54"
+SRCREV_machine_qemumips ?= "4f1c4fc19e8d2cb994dac34fb8bb32a7c776b318"
+SRCREV_machine_qemuppc ?= "7bb64db24c2b7bd2b6656036009bd71618eb125d"
+SRCREV_machine_qemuriscv64 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
+SRCREV_machine_qemux86 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
+SRCREV_machine_qemux86-64 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
+SRCREV_machine_qemumips64 ?= "931ad0c17451151dd3ddfb27dc2e33965f90ce86"
+SRCREV_machine ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
+SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.139"
+LINUX_VERSION ?= "5.4.141"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.31.1

[hardknott][PATCH 9/9] linux-yocto/5.4: update to v5.4.142

[Anuj Mittal]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:

    c15b830f7c1c Linux 5.4.142
    a17f2f2c8949 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
    7c1c96ffb658 KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653)
    456fd889227f iommu/vt-d: Fix agaw for a supported 48 bit guest address width
    5b5f855a793c vmlinux.lds.h: Handle clang's module.{c,d}tor sections
    e9b2b2b29ca8 ceph: take snap_empty_lock atomically with snaprealm refcount change
    95ff775df6ec ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm
    1d8c232afb03 ceph: add some lockdep assertions around snaprealm handling
    a6ff0f3f9f90 KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation
    ec25d05e1893 PCI/MSI: Protect msi_desc::masked for multi-MSI
    48d2439c6f2a PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown()
    386ead1d3598 PCI/MSI: Correct misleading comments
    76d81dec16d0 PCI/MSI: Do not set invalid bits in MSI mask
    6b4bcbf13390 PCI/MSI: Enforce MSI[X] entry updates to be visible
    4495a41fbcd7 PCI/MSI: Enforce that MSI-X table entry is masked for update
    1866c8f6d43c PCI/MSI: Mask all unused MSI-X entries
    3b4220c2bf35 PCI/MSI: Enable and mask MSI-X early
    0c8dea3fd55c genirq/timings: Prevent potential array overflow in __irq_timings_store()
    4dfe80927102 genirq/msi: Ensure deactivation on teardown
    e3e54a930073 x86/resctrl: Fix default monitoring groups reporting
    a6b594ad7419 x86/ioapic: Force affinity setup before startup
    db5e2666946a x86/msi: Force affinity setup before startup
    eda32c21882c genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP
    06b347743608 x86/tools: Fix objdump version check again
    74451dd8bfca powerpc/kprobes: Fix kprobe Oops happens in booke
    b74145d858a8 nbd: Aovid double completion of a request
    ad9550114d4c vsock/virtio: avoid potential deadlock when vsock device remove
    b9cd73cce50a xen/events: Fix race in set_evtchn_to_irq
    4d3c5c319b19 net: igmp: increase size of mr_ifc_count
    721ff564cc6a tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
    2ce8a68a312c net: linkwatch: fix failure to restore device state across suspend/resume
    33597972a2e9 net: bridge: fix memleak in br_add_if()
    f6eee53beb07 net: dsa: sja1105: fix broken backpressure in .port_fdb_dump
    1e6a570d3786 net: dsa: lantiq: fix broken backpressure in .port_fdb_dump
    564f6bbd0ed6 net: dsa: lan9303: fix broken backpressure in .port_fdb_dump
    a9243455e874 net: igmp: fix data-race in igmp_ifc_timer_expire()
    ed957c77b391 net: Fix memory leak in ieee802154_raw_deliver
    13a381b8bc22 net: dsa: microchip: Fix ksz_read64()
    991117eeeee8 drm/meson: fix colour distortion from HDR set during vendor u-boot
    e114f15de881 net/mlx5: Fix return value from tracer initialization
    f99aa76bb83c psample: Add a fwd declaration for skbuff
    9dc8e396c12e iavf: Set RSS LUT and key in reset handle path
    23436edae3c9 net: sched: act_mirred: Reset ct info when mirror/redirect skb
    9636fbfe7bdd ppp: Fix generating ifname when empty IFLA_IFNAME is specified
    1c31ee907fde net: phy: micrel: Fix link detection on ksz87xx switch"
    dfeb64f6e2ce platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables
    699db2bb96ad platform/x86: pcengines-apuv2: revert wiring up simswitch GPIO as LED
    af7f1539cfb1 net: dsa: mt7530: add the missing RxUnicast MIB counter
    d353a61860a2 ASoC: cs42l42: Fix LRCLK frame start edge
    b036452082f3 netfilter: nf_conntrack_bridge: Fix memory leak when error
    cd36a36ea4ea ASoC: cs42l42: Remove duplicate control for WNF filter frequency
    eb789cc9179f ASoC: cs42l42: Fix inversion of ADC Notch Switch control
    6a3381336398 ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J
    55e86f07b85e ASoC: cs42l42: Correct definition of ADC Volume control
    22d2e3c6a1b8 ieee802154: hwsim: fix GPF in hwsim_new_edge_nl
    5bac8c2a3087 ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi
    ddcf807fbb70 libnvdimm/region: Fix label activation vs errors
    bc97fde4c668 ACPI: NFIT: Fix support for virtual SPA ranges
    a753e3f33405 ceph: reduce contention in ceph_check_delayed_caps()
    aa04486c419d i2c: dev: zero out array used for i2c reads from userspace
    c18b28e5ade8 ASoC: intel: atom: Fix reference to PCM buffer address
    aab3fa544647 ASoC: xilinx: Fix reference to PCM buffer address
    60e2854acf3b iio: adc: Fix incorrect exit of for-loop
    bcac5225923b iio: humidity: hdc100x: Add margin to the conversion time
    da7cb80905ec iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 984859a88b..f838a65c35 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "e823f31a48749bf1d01a86c274fcec87fae1e5ba"
-SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
+SRCREV_machine ?= "b872fc896dcc555149f26c5dd683f7e6394852d6"
+SRCREV_meta ?= "719be4bd6c3c7575e7942dc016e3c3bb028f163d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.4.141"
+LINUX_VERSION ?= "5.4.142"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 44a033d5cb..0178d172f8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.4.141"
+LINUX_VERSION ?= "5.4.142"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "63d08f6ee3425e9d94eccf3a75a9ec4e474df916"
-SRCREV_machine ?= "05b2de44f781a297be454242d77f619189dfc6f4"
-SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
+SRCREV_machine_qemuarm ?= "4addf3f9e4f68bc7c03ea19ad95f2a4836ac9873"
+SRCREV_machine ?= "964802684eb1495bd1c5f625307b6d41515a3e9a"
+SRCREV_meta ?= "719be4bd6c3c7575e7942dc016e3c3bb028f163d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index e80c1e69ae..b30efe86c5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "91a35a54a7b2d4d558b3f8b24c39657a3ff71c7c"
-SRCREV_machine_qemuarm64 ?= "a8edc7f1b004c6fb56d142fba3e688ba2a051b54"
-SRCREV_machine_qemumips ?= "4f1c4fc19e8d2cb994dac34fb8bb32a7c776b318"
-SRCREV_machine_qemuppc ?= "7bb64db24c2b7bd2b6656036009bd71618eb125d"
-SRCREV_machine_qemuriscv64 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
-SRCREV_machine_qemux86 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
-SRCREV_machine_qemux86-64 ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
-SRCREV_machine_qemumips64 ?= "931ad0c17451151dd3ddfb27dc2e33965f90ce86"
-SRCREV_machine ?= "13fa9f66484db2492ee09667f45ad3e52e5b35ac"
-SRCREV_meta ?= "71f799f448d405a35d88ecee0aba3ec2b198d542"
+SRCREV_machine_qemuarm ?= "9b1b66b01c88cf5035d148f37c70b8215c8fde15"
+SRCREV_machine_qemuarm64 ?= "e91700bf8d8130226679954a8137c5f3fd54b81d"
+SRCREV_machine_qemumips ?= "332bc089f06636156b9d5b2a04228c03c680c6d0"
+SRCREV_machine_qemuppc ?= "1bf103767b96923aa6ca76e9e095b04c13ce93cd"
+SRCREV_machine_qemuriscv64 ?= "108b8b822e7bbba492deafe60ee86839291c3250"
+SRCREV_machine_qemux86 ?= "108b8b822e7bbba492deafe60ee86839291c3250"
+SRCREV_machine_qemux86-64 ?= "108b8b822e7bbba492deafe60ee86839291c3250"
+SRCREV_machine_qemumips64 ?= "7b31f99f9e245d029de7fb9e3480f7b00f846b8f"
+SRCREV_machine ?= "108b8b822e7bbba492deafe60ee86839291c3250"
+SRCREV_meta ?= "719be4bd6c3c7575e7942dc016e3c3bb028f163d"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.141"
+LINUX_VERSION ?= "5.4.142"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.31.1