From 7af4aa447cf617241ec2504e4bc2d98ea5fd2e27 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 21 Oct 2023 10:24:44 +0800 Subject: [PATCH 1/2] kernel: bump 5.15 to 5.15.136 --- include/kernel-5.15 | 4 ++-- .../950-fix-up-backport-of-interconnect-teach.patch | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 target/linux/generic/pending-5.15/950-fix-up-backport-of-interconnect-teach.patch diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 313e735a5430aa..3806ef18b47810 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .135 -LINUX_KERNEL_HASH-5.15.135 = 14835e629e237f136cfed484fdb533c95242429809bdcdb2a2d66dfcb7447170 +LINUX_VERSION-5.15 = .136 +LINUX_KERNEL_HASH-5.15.136 = c624b9fe7ee4708d34cfd0b7ebc58037afac7463338cc498641ea31c55eeacb8 diff --git a/target/linux/generic/pending-5.15/950-fix-up-backport-of-interconnect-teach.patch b/target/linux/generic/pending-5.15/950-fix-up-backport-of-interconnect-teach.patch deleted file mode 100644 index d9b479c1f6e7a0..00000000000000 --- a/target/linux/generic/pending-5.15/950-fix-up-backport-of-interconnect-teach.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c -index ab654b33f5d24..b7c41bd7409cd 100644 ---- a/drivers/interconnect/core.c -+++ b/drivers/interconnect/core.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include From 0f4df4fa226e7d3808ea47c5da77130ec89068f2 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 21 Oct 2023 22:02:30 +0800 Subject: [PATCH 2/2] kernel: fix kmod-video-core on linux kernel 6.1+ --- package/kernel/linux/modules/video.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 3b898693298383..d43dbf386b0e4d 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -502,7 +502,7 @@ define KernelPackage/video-core CONFIG_MEDIA_CAMERA_SUPPORT=y \ CONFIG_VIDEO_DEV \ CONFIG_V4L_PLATFORM_DRIVERS=y - FILES:= \ + FILES:=$(LINUX_DIR)/drivers/media/mc/mc.ko@ge6.1 \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) endef