From 6b443c2b7ce0ab3d53eba8cf69a5c542739921a3 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sat, 7 Mar 2026 19:38:15 +0100 Subject: [PATCH] emlog: bump to latest revision Drop the patch that is included in this release. Actually that is also the changelog since the previous version - there were no other changes beside the accepted patch. Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- meta-oe/recipes-core/emlog/emlog.inc | 3 +- ...not-use-no_llseek-with-kernel-6.12.0.patch | 32 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index ff2a106c6e..d51c9723fd 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc @@ -4,8 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" -SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch" -SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" +SRCREV = "a50aae487f689c1abb46b151abc68d6635b9b2fe" PV = "0.70+git" CVE_PRODUCT = "nicupavel:emlog" diff --git a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch deleted file mode 100644 index 86f719b0bb..0000000000 --- a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 14 Dec 2024 09:55:10 -0800 -Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+ - -no_llseek is finally gone with 6.12-rc1 [1] - -[1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8 - -Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16] ---- - emlog.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/emlog.c b/emlog.c -index 2ead738..b45c72d 100644 ---- a/emlog.c -+++ b/emlog.c -@@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = { - .open = emlog_open, - .release = emlog_release, - .poll = emlog_poll, -- .llseek = no_llseek, /* no_llseek by default introduced at v2.6.37-rc1 */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) -+ /* no_llseek by default introduced at v2.6.37-rc1 and -+ * removed in 6.12.0 -+ */ -+ .llseek = no_llseek, -+#endif - .owner = THIS_MODULE, - }; -