Merge branch '3.0-dev' into 3.0

Merge branch '3.0-dev' commit 4567739

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>

Author: cheeyanglee

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -2355,6 +2355,7 @@
                 "gflags",
                 "gh",
                 "go-md2man",
+                "groff",
                 "grpc",
                 "grub2-efi-binary-signed",
                 "GSL",
@@ -2831,7 +2832,6 @@
                 "gpgme",
                 "gptfdisk",
                 "grep",
-                "groff",
                 "grub2",
                 "gtest",
                 "gtk-doc",
@@ -3011,7 +3011,6 @@
                 "perl-Crypt-SSLeay",
                 "perl-DBD-SQLite",
                 "perl-DBI",
-                "perl-DBIx-Simple",
                 "perl-Exporter-Tiny",
                 "perl-File-HomeDir",
                 "perl-File-Which",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -241,7 +241,6 @@ gpgme
 gptfdisk
 graphviz
 grep
-groff
 grpc
 grubby
 gsettings-desktop-schemas

SPECS/.gitignore

@@ -0,0 +1 @@
+# No patch has been made available for CVE-2000-0803

SPECS/groff/CVE-2000-0803.nopatch

@@ -0,0 +1,5 @@
+{
+  "Signatures": {
+    "groff-1.23.0.tar.gz": "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
+  }
+}

SPECS/groff/groff.signatures.json

@@ -0,0 +1,104 @@
+Summary:        Programs for processing and formatting text
+Name:           groff
+Version:        1.23.0
+Release:        2%{?dist}
+License:        GPLv3+
+Vendor:         Intel Corporation
+Distribution:   Edge Microvisor Toolkit
+Group:          Applications/Text
+URL:            https://www.gnu.org/software/groff/
+Source0:        https://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
+# No patch has been made available for CVE-2000-0803
+Patch0:         CVE-2000-0803.nopatch
+Requires:       perl-DBD-SQLite
+Requires:       perl-DBI
+Requires:       perl-File-HomeDir
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Provides:       perl(oop_fh.pl) = %{version}-%{release}
+Provides:       perl(main_subs.pl) = %{version}-%{release}
+Provides:       perl(man.pl) = %{version}-%{release}
+Provides:       perl(subs.pl) = %{version}-%{release}
+Provides:       groff-base = %{version}-%{release}
+AutoReq:        no
+
+%description
+The Groff package contains programs for processing
+and formatting text.
+
+%prep
+%setup -q
+
+%build
+PAGE=letter ./configure \
+    --prefix=%{_prefix} \
+    --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer \
+    --without-x
+make
+
+%install
+install -vdm 755 %{_defaultdocdir}/%{name}-1.22/pdf
+make DESTDIR=%{buildroot} install
+
+# some binaries need alias with 'g' or 'z' prefix
+for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do
+    ln -s ${file#?} %{buildroot}%{_bindir}/${file}
+    ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
+done
+
+rm -rf %{buildroot}%{_infodir}
+
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%license LICENSES
+%{_bindir}/*
+%{_libdir}/groff/*
+%{_defaultdocdir}/%{name}-%{version}/*
+%{_datarootdir}/%{name}/*
+%{_mandir}/*/*
+
+%changelog
+* Tue Jan 6 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 1.23.0-2
+- drop Required on perl-DBIx-Simple
+- Initial Edge Microvisor Toolkit import from Azure Linux (license: MIT).
+
+* Mon Oct 16 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.23.0-1
+- Auto-upgrade to 1.23.0 - Azure Linux 3.0 - package upgrades
+
+* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.22.4-2
+- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
+
+* Sat Nov 20 2021 Chris Co <chrco@microsoft.com> - 1.22.4-1
+- Update to 1.22.4
+- License verified
+
+* Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.22.3-7
+- Adding Fedora's symbolic links to provide the same set of file paths.
+
+* Mon Oct 12 2020 Joe Schmitt <joschmit@microsoft.com> - 1.22.3-6 (from dev branch)
+- Use new perl package names.
+- Provide groff-base.
+
+* Mon Oct 05 2020 Daniel Burgener <daburgen@microsoft.com> - 1.22.3-6 (from 1.0 branch)
+- Ensure build without X11 support
+- Don't automatically add requirements when built in the toolchain
+
+* Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> - 1.22.3-5
+- Nopatch CVE-2000-0803.nopatch
+
+* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.22.3-4
+- Added %%license line automatically
+
+* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 1.22.3-3
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 1.22.3-2
+- GA - Bump release of all rpms
+
+* Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> - 1.22.3-1
+- Updated to version 1.22.3
+
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> - 1.22.2-1
+- Initial build. First version

SPECS/groff/groff.spec

@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "linux-6.12.59.tar.gz": "93dfe627d321f016291054449a8e4bf9051de19687fbf1a6f584a2b79f8f5d2c"
+    "linux-6.12.61.tar.gz": "7fb34abab0902a47ce1d47de58442e69e0e79d17f565b41fcb11249ea5b23801"
   }
 }

SPECS/kernel-headers/kernel-headers.signatures.json

@@ -13,14 +13,14 @@
 
 Summary:        Linux API header files
 Name:           kernel-headers
-Version:        6.12.59
-Release:        1%{?dist}
+Version:        6.12.61
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Intel Corporation
 Distribution:   Edge Microvisor Toolkit
 Group:          System Environment/Kernel
 URL:            https://www.kernel.org/pub/linux/kernel
-Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.59.tar.gz
+Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.61.tar.gz
 # Historical name shipped by other distros
 Provides:       glibc-kernheaders = %{version}-%{release}
 BuildArch:      noarch
@@ -41,7 +41,7 @@ cross-glibc package.
 %endif
 
 %prep
-%setup -q -n linux-6.12.59
+%setup -q -n linux-6.12.61
 
 %build
 make mrproper
@@ -76,6 +76,13 @@ done
 %endif
 
 %changelog
+* Fri Jan 9 2026 Lishan Liu <lishan.liu@intel.com> - 6.12.61-2
+- Update kernel to 6.12.61-2
+- lts-v6.12.61-emt-cve-260106T193826Z
+
+* Fri Jan 2 2026 Lishan Liu <lishan.liu@intel.com> - 6.12.61-1
+- Update kernel to 6.12.61-1
+
 * Thu Dec 11 2025 Lishan Liu <lishan.liu@intel.com> - 6.12.59-1
 - Update kernel to 6.12.59
 

SPECS/kernel-headers/kernel-headers.spec

@@ -0,0 +1,36 @@
+From 7190df9cb5fc10c673e960b7144d470fcd373627 Mon Sep 17 00:00:00 2001
+From: "Chew, Tong Liang" <tong.liang.chew@intel.com>
+Date: Sat, 27 Dec 2025 11:51:55 +0800
+Subject: [PATCH] Revert "drm/i915: Do not advertise about CCS"
+
+This reverts commit 1e5d5fbf3f18d0c4b534c431fa71c065ee048a63.
+
+Signed-off-by: Chew, Tong Liang <tong.liang.chew@intel.com>
+---
+ drivers/gpu/drm/i915/i915_query.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
+index 72201c8d9ecd9..7c6669cc4c96f 100644
+--- a/drivers/gpu/drm/i915/i915_query.c
++++ b/drivers/gpu/drm/i915/i915_query.c
+@@ -159,16 +159,6 @@ query_engine_info(struct drm_i915_private *i915,
+ 	info_ptr = &query_ptr->engines[0];
+ 
+ 	for_each_uabi_engine(engine, i915) {
+-		/* Do not advertise CCS is available for selected platforms
+-		 * as CCS is not actually functional on those.
+-		 */
+-		if ((INTEL_INFO(i915)->platform == INTEL_DG1 ||
+-				INTEL_INFO(i915)->platform == INTEL_TIGERLAKE ||
+-				INTEL_INFO(i915)->platform == INTEL_ALDERLAKE_S ||
+-				INTEL_INFO(i915)->platform == INTEL_ALDERLAKE_P) &&
+-				engine->uabi_class == I915_ENGINE_CLASS_COMPUTE)
+-			continue;
+-
+ 		info.engine.engine_class = engine->uabi_class;
+ 		info.engine.engine_instance = engine->uabi_instance;
+ 		info.flags = I915_ENGINE_INFO_HAS_LOGICAL_INSTANCE;
+-- 
+2.34.1
+

SPECS/kernel-rt/0001-Revert-drm-i915-Do-not-advertise-about-CCS.sriov

@@ -0,0 +1,29 @@
+From f18bd93ea20bf2a8b7360b245db7a9119a2e54ac Mon Sep 17 00:00:00 2001
+From: Junxiao Chang <junxiao.chang@intel.com>
+Date: Sat, 6 Dec 2025 17:11:22 +0800
+Subject: [PATCH] drm/i915: no force probe needed for mtl platform
+
+mtl has been supported in 6.12 kernel. No need to add require force
+probe flag.
+
+Fixes: 9fd5e45e3167 ("Revert "drm/i915: move platform_engine_mask and memory_regions to device info"")
+Signed-off-by: Junxiao Chang <junxiao.chang@intel.com>
+---
+ drivers/gpu/drm/i915/i915_pci.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
+index 8aff711aa887b..9eb8216389251 100644
+--- a/drivers/gpu/drm/i915/i915_pci.c
++++ b/drivers/gpu/drm/i915/i915_pci.c
+@@ -795,7 +795,6 @@ static const struct intel_device_info mtl_info = {
+ 	.has_pxp = 1,
+ 	.__runtime.memory_regions = BIT(INTEL_REGION_SMEM) | BIT(INTEL_REGION_STOLEN_LMEM),
+ 	.__runtime.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),
+-	.require_force_probe = 1,
+ 	MTL_CACHELEVEL,
+ };
+ 
+-- 
+2.43.0
+