[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: kernel: fix kmod-video-core on linux kernel 6.1+ kernel: bump 5.15 to 5.15.136
UtMetoo · Oct 21, 2023 · 13907c3 · 13907c3
2 parents 94128f3 + 0f4df4f
commit 13907c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git 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/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/[email protected] \
 	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
   AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
 endef

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