diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-06-21 22:16:26 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-08-09 11:39:42 -1000 |
| commit | 5fb62be8e66bca60257fbec80ff70aad6175217c (patch) | |
| tree | 900a4a18a7681698d80a3cc02da869b84a5ac0cf /meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch | |
| parent | 6216cc2fb8ec6ddc12a02c45af5b3508a4e809fc (diff) | |
| download | openembedded-core-contrib-5fb62be8e66bca60257fbec80ff70aad6175217c.tar.gz | |
lttng-modules: update 2.13.3 -> 2.13.4
Drop backports; one of them (0009) is present only
on the master branch and not on 2.13 branch, and so
stays in the recipe.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1002941b76e0a0351e85a20e3e8d0a6a2254449c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch deleted file mode 100644 index 9248ffe4ff..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Mon, 4 Apr 2022 13:54:59 -0400 -Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) - -See upstream commit : - - commit 322cbb50de711814c42fb088f6d31901502c711a - Author: Christoph Hellwig <hch@lst.de> - Date: Mon Jan 24 10:39:13 2022 +0100 - - block: remove genhd.h - - There is no good reason to keep genhd.h separate from the main blkdev.h - header that includes it. So fold the contents of genhd.h into blkdev.h - and remove genhd.h entirely. - -Upstream-Status: Backport - -Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - include/wrapper/genhd.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h -index 3c6dbcbe..4a59b68e 100644 ---- a/include/wrapper/genhd.h -+++ b/include/wrapper/genhd.h -@@ -12,7 +12,11 @@ - #ifndef _LTTNG_WRAPPER_GENHD_H - #define _LTTNG_WRAPPER_GENHD_H - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) -+#include <linux/blkdev.h> -+#else - #include <linux/genhd.h> -+#endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) - #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN --- -2.19.1 - |