commit 91a36030d4fb1a2b3c86913abbde36285ba86a20 Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Tue Oct 15 13:14:45 2024 +0200 Fix building against 6.12 kernels Fix building against 6.12 kernels Fix building against 6.12 kernels 0001-gc5035-Fix-compilation-with-kernels-6.8.patch | 4 +- ...ia-ipu6-Fix-compilation-with-kernels-6.10.patch | 31 ++- ...efix-ipu6-modules-with-icamera-instead-of.patch | 6 +- ...ia-ipu6-Fix-compilation-with-kernels-6.11.patch | 9 +- ...Fix-compilation-with-kernels-6.12-move-as.patch | 269 +++++++++++++++++++++ ...Fix-compilation-with-kernels-6.12-Finally.patch | 53 ++++ intel-ipu6-kmod.spec | 12 +- 7 files changed, 367 insertions(+), 17 deletions(-) --- diff --git a/0001-gc5035-Fix-compilation-with-kernels-6.8.patch b/0001-gc5035-Fix-compilation-with-kernels-6.8.patch index 64d7cd1..20faa71 100644 --- a/0001-gc5035-Fix-compilation-with-kernels-6.8.patch +++ b/0001-gc5035-Fix-compilation-with-kernels-6.8.patch @@ -1,7 +1,7 @@ From 1e0c448f48540e08f621b324627feca927eb75fe Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Mon, 10 Jun 2024 13:41:16 +0200 -Subject: [PATCH 1/4] gc5035: Fix compilation with kernels >= 6.8 +Subject: [PATCH 1/6] gc5035: Fix compilation with kernels >= 6.8 For some reason the gc5035 driver has been disabled for kernels >= 6.8, but it is not upstream yet. @@ -92,5 +92,5 @@ index 16bbd4845..e825dfa7d 100644 if (ret) { dev_err_probe(dev, ret, "Failed to initialize controls\n"); -- -2.45.1 +2.47.0 diff --git a/0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch b/0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch index b5dc032..0ce55a5 100644 --- a/0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch +++ b/0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch @@ -1,16 +1,18 @@ -From d28c18461df553e523e341ca24ca835767f39db8 Mon Sep 17 00:00:00 2001 +From 5917297efb44d52548a052c04e9f759926ca2ddd Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Tue, 11 Jun 2024 11:39:34 +0200 -Subject: [PATCH 2/4] media: ipu6: Fix compilation with kernels >= 6.10 +Subject: [PATCH 2/6] media: ipu6: Fix compilation with kernels >= 6.10 Fix compilation with kernels >= 6.10. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com&gt; +[vicamo: update for v6.12-rc1] +Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; --- drivers/media/pci/intel/ipu-mmu.c | 1 + - drivers/media/pci/intel/ipu-psys.c | 16 ++++++++++++++++ + drivers/media/pci/intel/ipu-psys.c | 31 ++++++++++++++++++++++++++++++ drivers/media/pci/intel/ipu.c | 1 + - 3 files changed, 18 insertions(+) + 3 files changed, 33 insertions(+) diff --git a/drivers/media/pci/intel/ipu-mmu.c b/drivers/media/pci/intel/ipu-mmu.c index a36a6ded8..b06c9f8c1 100644 @@ -25,10 +27,10 @@ index a36a6ded8..b06c9f8c1 100644 #include "ipu.h" #include "ipu-platform.h" diff --git a/drivers/media/pci/intel/ipu-psys.c b/drivers/media/pci/intel/ipu-psys.c -index b12ecf3fc..b93e47aaf 100644 +index b12ecf3fc..87fab7cf8 100644 --- a/drivers/media/pci/intel/ipu-psys.c +++ b/drivers/media/pci/intel/ipu-psys.c -@@ -128,6 +128,22 @@ ipu_psys_lookup_kbuffer_by_kaddr(struct ipu_psys_fh *fh, void *kaddr) +@@ -128,6 +128,37 @@ ipu_psys_lookup_kbuffer_by_kaddr(struct ipu_psys_fh *fh, void *kaddr) return NULL; } @@ -36,6 +38,7 @@ index b12ecf3fc..b93e47aaf 100644 +/* Dropped from 6.10, use our own copy for now */ +static int follow_pfn(struct vm_area_struct *vma, unsigned long address, unsigned long *pfn) +{ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + spinlock_t *ptl; + pte_t *ptep; + @@ -44,6 +47,20 @@ index b12ecf3fc..b93e47aaf 100644 + + *pfn = pte_pfn(ptep_get(ptep)); + pte_unmap_unlock(ptep, ptl); ++#else ++ struct follow_pfnmap_args args = { ++ .vma = vma, ++ .address = address, ++ }; ++ int ret; ++ ++ ret = follow_pfnmap_start(&args); ++ if (ret) ++ return ret; ++ ++ *pfn = args.pfn; ++ follow_pfnmap_end(&args); ++#endif + return 0; +} +#endif @@ -64,5 +81,5 @@ index 33592a662..fc091a11a 100644 #include "ipu.h" #include "ipu-buttress.h" -- -2.45.1 +2.47.0 diff --git a/0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch b/0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch index b678afc..50cab6d 100644 --- a/0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch +++ b/0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch @@ -1,7 +1,7 @@ -From 2ea9ccd5fc964251da4c4c47abd7321ce868e478 Mon Sep 17 00:00:00 2001 +From 3ddee5543a8caa4bb716fd0ff815d52b0d09bbb1 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Mon, 10 Jun 2024 19:30:48 +0200 -Subject: [PATCH 3/4] Makefile: prefix ipu6 modules with icamera- instead of +Subject: [PATCH 3/6] Makefile: prefix ipu6 modules with icamera- instead of intel- Now that IPU6 isys support has landed upstream, using an auxbus approach @@ -80,5 +80,5 @@ index 23f8cdba4..92cd9fe1b 100644 ccflags-y += -I$(srcpath)/$(src)/../../../../../include/ ccflags-y += -I$(srcpath)/$(src)/../ -- -2.45.1 +2.47.0 diff --git a/0004-fix-6.11-kernel.patch b/0004-media-ipu6-Fix-compilation-with-kernels-6.11.patch similarity index 83% rename from 0004-fix-6.11-kernel.patch rename to 0004-media-ipu6-Fix-compilation-with-kernels-6.11.patch index bb94269..b24c4ae 100644 --- a/0004-fix-6.11-kernel.patch +++ b/0004-media-ipu6-Fix-compilation-with-kernels-6.11.patch @@ -1,7 +1,7 @@ -From 1b753acb70b39920d0ec25fece97a038f2ce038e Mon Sep 17 00:00:00 2001 +From 5c1e910f6c473f7f53377219e1f00b36e6ae7da1 Mon Sep 17 00:00:00 2001 From: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; Date: Thu, 8 Aug 2024 14:30:51 +0800 -Subject: [PATCH] media: ipu6: Fix compilation with kernels >= 6.11 +Subject: [PATCH 4/6] media: ipu6: Fix compilation with kernels >= 6.11 Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; --- @@ -9,7 +9,7 @@ Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c -index 0569ccb61969..234fde8f1a42 100644 +index 0569ccb61..234fde8f1 100644 --- a/drivers/media/pci/intel/ipu-bus.c +++ b/drivers/media/pci/intel/ipu-bus.c @@ -75,9 +75,13 @@ static const struct dev_pm_ops ipu_bus_pm_ops = { @@ -27,3 +27,6 @@ index 0569ccb61969..234fde8f1a42 100644 dev_dbg(dev, "bus match: \"%s\" --- \"%s\"\n", dev_name(dev), adrv->wanted); +-- +2.47.0 + diff --git a/0005-media-ipu6-Fix-compilation-with-kernels-6.12-move-as.patch b/0005-media-ipu6-Fix-compilation-with-kernels-6.12-move-as.patch new file mode 100644 index 0000000..89aa9e9 --- /dev/null +++ b/0005-media-ipu6-Fix-compilation-with-kernels-6.12-move-as.patch @@ -0,0 +1,269 @@ +From 3bbe043c6c92ef8fb2482077911ca6ea5fb2ef52 Mon Sep 17 00:00:00 2001 +From: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; +Date: Fri, 11 Oct 2024 01:44:50 +0800 +Subject: [PATCH 5/6] media: ipu6: Fix compilation with kernels >= 6.12: move + asm/unaligned.h to linux/unaligned.h + +Accommodate to v6.12-rc2 commit 5f60d5f6bbc12 ("move asm/unaligned.h to +linux/unaligned.h"). + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2083996 +Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; +Signed-off-by: Hans de Goede <hdegoede(a)redhat.com&gt; +--- + drivers/media/i2c/hi556.c | 6 +++++- + drivers/media/i2c/hm11b1.c | 6 +++++- + drivers/media/i2c/hm2170.c | 6 +++++- + drivers/media/i2c/hm2172.c | 6 +++++- + drivers/media/i2c/ov01a10.c | 6 +++++- + drivers/media/i2c/ov01a1s.c | 6 +++++- + drivers/media/i2c/ov02c10.c | 6 +++++- + drivers/media/i2c/ov02e10.c | 6 +++++- + drivers/media/i2c/ov2740.c | 6 +++++- + drivers/media/i2c/ov8856.c | 6 +++++- + 10 files changed, 50 insertions(+), 10 deletions(-) + +diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c +index 4fc020b65..90080438b 100644 +--- a/drivers/media/i2c/hi556.c ++++ b/drivers/media/i2c/hi556.c +@@ -1,14 +1,18 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2019 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/clk.h> + #include <linux/delay.h> + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/hm11b1.c b/drivers/media/i2c/hm11b1.c +index f3900d29f..173bb32eb 100644 +--- a/drivers/media/i2c/hm11b1.c ++++ b/drivers/media/i2c/hm11b1.c +@@ -1,13 +1,17 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2020-2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/hm2170.c b/drivers/media/i2c/hm2170.c +index 102eec25a..060bb04d1 100644 +--- a/drivers/media/i2c/hm2170.c ++++ b/drivers/media/i2c/hm2170.c +@@ -1,7 +1,12 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> +@@ -9,7 +14,6 @@ + #include <linux/pm_runtime.h> + #include <linux/nvmem-provider.h> + #include <linux/regmap.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/hm2172.c b/drivers/media/i2c/hm2172.c +index 3362d3151..422166f04 100644 +--- a/drivers/media/i2c/hm2172.c ++++ b/drivers/media/i2c/hm2172.c +@@ -1,7 +1,12 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> +@@ -9,7 +14,6 @@ + #include <linux/pm_runtime.h> + #include <linux/nvmem-provider.h> + #include <linux/regmap.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov01a10.c b/drivers/media/i2c/ov01a10.c +index 78ae01811..aa47a50e5 100644 +--- a/drivers/media/i2c/ov01a10.c ++++ b/drivers/media/i2c/ov01a10.c +@@ -1,13 +1,17 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2020-2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov01a1s.c b/drivers/media/i2c/ov01a1s.c +index f7cf2218c..639b0921f 100644 +--- a/drivers/media/i2c/ov01a1s.c ++++ b/drivers/media/i2c/ov01a1s.c +@@ -1,13 +1,17 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2020-2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov02c10.c b/drivers/media/i2c/ov02c10.c +index 40865f8e3..0a1fed161 100644 +--- a/drivers/media/i2c/ov02c10.c ++++ b/drivers/media/i2c/ov02c10.c +@@ -1,7 +1,12 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/clk.h> + #include <linux/delay.h> +@@ -9,7 +14,6 @@ + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov02e10.c b/drivers/media/i2c/ov02e10.c +index 916def90f..ea82040f2 100644 +--- a/drivers/media/i2c/ov02e10.c ++++ b/drivers/media/i2c/ov02e10.c +@@ -1,7 +1,12 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2023 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/clk.h> + #include <linux/delay.h> +@@ -9,7 +14,6 @@ + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov2740.c b/drivers/media/i2c/ov2740.c +index bd9b68e34..4ed0094f7 100644 +--- a/drivers/media/i2c/ov2740.c ++++ b/drivers/media/i2c/ov2740.c +@@ -1,7 +1,12 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> +@@ -9,7 +14,6 @@ + #include <linux/pm_runtime.h> + #include <linux/nvmem-provider.h> + #include <linux/regmap.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c +index 1c4469ea0..a2c7c8c22 100644 +--- a/drivers/media/i2c/ov8856.c ++++ b/drivers/media/i2c/ov8856.c +@@ -1,13 +1,17 @@ + // SPDX-License-Identifier: GPL-2.0 + // Copyright (c) 2021-2022 Intel Corporation. + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include <asm/unaligned.h> ++#else ++#include <linux/unaligned.h> ++#endif + #include <linux/acpi.h> + #include <linux/delay.h> + #include <linux/i2c.h> + #include <linux/module.h> + #include <linux/pm_runtime.h> +-#include <linux/version.h> + #include <media/v4l2-ctrls.h> + #include <media/v4l2-device.h> + #include <media/v4l2-fwnode.h> +-- +2.47.0 + diff --git a/0006-media-ipu6-Fix-compilation-with-kernels-6.12-Finally.patch b/0006-media-ipu6-Fix-compilation-with-kernels-6.12-Finally.patch new file mode 100644 index 0000000..e4501d4 --- /dev/null +++ b/0006-media-ipu6-Fix-compilation-with-kernels-6.12-Finally.patch @@ -0,0 +1,53 @@ +From f89a4e3da45753d012b3c40bfe9c8b56671e5306 Mon Sep 17 00:00:00 2001 +From: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; +Date: Fri, 11 Oct 2024 01:28:38 +0800 +Subject: [PATCH 6/6] media: ipu6: Fix compilation with kernels >= 6.12: + Finally take no_llseek out + +Accommodate to v6.12-rc1 commit cb787f4ac0c2 ("[tree-wide] finally take +no_llseek out"). + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2083996 +Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com&gt; +Signed-off-by: Hans de Goede <hdegoede(a)redhat.com&gt; +--- + drivers/media/pci/intel/ipu-trace.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/media/pci/intel/ipu-trace.c b/drivers/media/pci/intel/ipu-trace.c +index 282ac659a..2dc458a1d 100644 +--- a/drivers/media/pci/intel/ipu-trace.c ++++ b/drivers/media/pci/intel/ipu-trace.c +@@ -517,7 +517,9 @@ static const struct file_operations ipu_traceconf_fops = { + .release = traceconf_release, + .read = traceconf_read, + .write = traceconf_write, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + .llseek = no_llseek, ++#endif + }; + + static void wptraceconf_dump(struct ipu_device *isp) +@@ -673,7 +675,9 @@ static const struct file_operations ipu_wptraceconf_fops = { + .release = wptraceconf_release, + .read = wptraceconf_read, + .write = wptraceconf_write, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + .llseek = no_llseek, ++#endif + }; + + static int gettrace_open(struct inode *inode, struct file *file) +@@ -740,7 +744,9 @@ static const struct file_operations ipu_gettrace_fops = { + .release = gettrace_release, + .read = gettrace_read, + .write = gettrace_write, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + .llseek = no_llseek, ++#endif + }; + + int ipu_trace_init(struct ipu_device *isp, void __iomem *base, +-- +2.47.0 + diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec index 1bc44af..22d62c3 100644 --- a/intel-ipu6-kmod.spec +++ b/intel-ipu6-kmod.spec @@ -16,7 +16,7 @@ Name: %{prjname}-kmod Summary: Kernel module (kmod) for %{prjname} Version: 0.0 -Release: 16.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist} +Release: 17.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist} License: GPLv2+ URL: https://github.com/intel/ipu6-drivers @@ -31,7 +31,10 @@ Patch2: 0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch # https://github.com/intel/ipu6-drivers/pull/243 Patch3: 0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch # https://github.com/intel/ipu6-drivers/pull/261 -Patch4: 0004-fix-6.11-kernel.patch +Patch4: 0004-media-ipu6-Fix-compilation-with-kernels-6.11.patch +# https://github.com/intel/ipu6-drivers/pull/283 +Patch5: 0005-media-ipu6-Fix-compilation-with-kernels-6.12-move-as.patch +Patch6: 0006-media-ipu6-Fix-compilation-with-kernels-6.12-Finally.patch # Downstream / Fedora specific patches Patch101: 0101-Makefile-Adjust-which-modules-to-build-for-which-ker.patch @@ -62,6 +65,8 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil %patch 2 -p1 %patch 3 -p1 %patch 4 -p1 +%patch 5 -p1 +%patch 6 -p1 %patch 101 -p1 ) @@ -94,6 +99,9 @@ done %changelog +* Tue Oct 15 2024 Hans de Goede <hdegoede(a)redhat.com&gt; - 0.0-17.20240624gitaecec2a +- Fix building against 6.12 kernels + * Thu Aug 29 2024 Hans de Goede <hdegoede(a)redhat.com&gt; - 0.0-16.20240624gitaecec2a - Fix building against 6.11 kernels