[intel-ipu6-kmod/f39: 8/8] Merge remote-tracking branch 'origin/master' into f39
commit 6aceb422cba9d5e6446384c437b6dfb669287149
Merge: 577ee8c 35b1d4f
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Fri Apr 19 16:51:12 2024 +0800
Merge remote-tracking branch 'origin/master' into f39
.gitignore | 1 +
intel-ipu6-kmod.spec | 15 +++----
sources | 2 +-
vsc-44.patch | 124 ---------------------------------------------------
4 files changed, 9 insertions(+), 133 deletions(-)
---
diff --cc intel-ipu6-kmod.spec
index 5afedbf,cf960e1..6337899
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@@ -16,7 -16,7 +16,7 @@@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.0
- Release: 11.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
-Release: 13.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
++Release: 12.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel
@@@ -109,7 -104,11 +104,11 @@@ don
%changelog
-* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-13.20240226gitfb4c170
++* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-12.20240226gitfb4c170
+ - Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+ - ivsc: Update mei_dev.h for kernel >= 6.8
+
-* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-12.20240226gitfb4c170
+* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-11.20240226gitfb4c170
- Fix for kernel >= 6.7
- Fix and improve ipu6_isys probe()
- Skip ljca driver when the system runs the kernel >= 6.7