Skip to content

Commit e5fde5d

Browse files
cheeyangleecheeyanglee
committed
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>
2 parents 73e710e + 4567739 commit e5fde5d

File tree

125 files changed

+10081
-888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+10081
-888
lines changed

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,6 +2355,7 @@
23552355
"gflags",
23562356
"gh",
23572357
"go-md2man",
2358+
"groff",
23582359
"grpc",
23592360
"grub2-efi-binary-signed",
23602361
"GSL",
@@ -2831,7 +2832,6 @@
28312832
"gpgme",
28322833
"gptfdisk",
28332834
"grep",
2834-
"groff",
28352835
"grub2",
28362836
"gtest",
28372837
"gtk-doc",
@@ -3011,7 +3011,6 @@
30113011
"perl-Crypt-SSLeay",
30123012
"perl-DBD-SQLite",
30133013
"perl-DBI",
3014-
"perl-DBIx-Simple",
30153014
"perl-Exporter-Tiny",
30163015
"perl-File-HomeDir",
30173016
"perl-File-Which",

‎SPECS/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ gpgme
241241
gptfdisk
242242
graphviz
243243
grep
244-
groff
245244
grpc
246245
grubby
247246
gsettings-desktop-schemas

‎SPECS/groff/CVE-2000-0803.nopatch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# No patch has been made available for CVE-2000-0803

‎SPECS/groff/groff.signatures.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Signatures": {
3+
"groff-1.23.0.tar.gz": "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
4+
}
5+
}

‎SPECS/groff/groff.spec‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
Summary: Programs for processing and formatting text
2+
Name: groff
3+
Version: 1.23.0
4+
Release: 2%{?dist}
5+
License: GPLv3+
6+
Vendor: Intel Corporation
7+
Distribution: Edge Microvisor Toolkit
8+
Group: Applications/Text
9+
URL: https://www.gnu.org/software/groff/
10+
Source0: https://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
11+
# No patch has been made available for CVE-2000-0803
12+
Patch0: CVE-2000-0803.nopatch
13+
Requires: perl-DBD-SQLite
14+
Requires: perl-DBI
15+
Requires: perl-File-HomeDir
16+
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
17+
Provides: perl(oop_fh.pl) = %{version}-%{release}
18+
Provides: perl(main_subs.pl) = %{version}-%{release}
19+
Provides: perl(man.pl) = %{version}-%{release}
20+
Provides: perl(subs.pl) = %{version}-%{release}
21+
Provides: groff-base = %{version}-%{release}
22+
AutoReq: no
23+
24+
%description
25+
The Groff package contains programs for processing
26+
and formatting text.
27+
28+
%prep
29+
%setup -q
30+
31+
%build
32+
PAGE=letter ./configure \
33+
--prefix=%{_prefix} \
34+
--with-grofferdir=%{_datadir}/%{name}/%{version}/groffer \
35+
--without-x
36+
make
37+
38+
%install
39+
install -vdm 755 %{_defaultdocdir}/%{name}-1.22/pdf
40+
make DESTDIR=%{buildroot} install
41+
42+
# some binaries need alias with 'g' or 'z' prefix
43+
for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do
44+
ln -s ${file#?} %{buildroot}%{_bindir}/${file}
45+
ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
46+
done
47+
48+
rm -rf %{buildroot}%{_infodir}
49+
50+
%post -p /sbin/ldconfig
51+
%postun -p /sbin/ldconfig
52+
53+
%files
54+
%defattr(-,root,root)
55+
%license LICENSES
56+
%{_bindir}/*
57+
%{_libdir}/groff/*
58+
%{_defaultdocdir}/%{name}-%{version}/*
59+
%{_datarootdir}/%{name}/*
60+
%{_mandir}/*/*
61+
62+
%changelog
63+
* Tue Jan 6 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 1.23.0-2
64+
- drop Required on perl-DBIx-Simple
65+
- Initial Edge Microvisor Toolkit import from Azure Linux (license: MIT).
66+
67+
* Mon Oct 16 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.23.0-1
68+
- Auto-upgrade to 1.23.0 - Azure Linux 3.0 - package upgrades
69+
70+
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.22.4-2
71+
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
72+
73+
* Sat Nov 20 2021 Chris Co <chrco@microsoft.com> - 1.22.4-1
74+
- Update to 1.22.4
75+
- License verified
76+
77+
* Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.22.3-7
78+
- Adding Fedora's symbolic links to provide the same set of file paths.
79+
80+
* Mon Oct 12 2020 Joe Schmitt <joschmit@microsoft.com> - 1.22.3-6 (from dev branch)
81+
- Use new perl package names.
82+
- Provide groff-base.
83+
84+
* Mon Oct 05 2020 Daniel Burgener <daburgen@microsoft.com> - 1.22.3-6 (from 1.0 branch)
85+
- Ensure build without X11 support
86+
- Don't automatically add requirements when built in the toolchain
87+
88+
* Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> - 1.22.3-5
89+
- Nopatch CVE-2000-0803.nopatch
90+
91+
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.22.3-4
92+
- Added %%license line automatically
93+
94+
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 1.22.3-3
95+
- Initial CBL-Mariner import from Photon (license: Apache2).
96+
97+
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 1.22.3-2
98+
- GA - Bump release of all rpms
99+
100+
* Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> - 1.22.3-1
101+
- Updated to version 1.22.3
102+
103+
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> - 1.22.2-1
104+
- Initial build. First version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"linux-6.12.59.tar.gz": "93dfe627d321f016291054449a8e4bf9051de19687fbf1a6f584a2b79f8f5d2c"
3+
"linux-6.12.61.tar.gz": "7fb34abab0902a47ce1d47de58442e69e0e79d17f565b41fcb11249ea5b23801"
44
}
55
}

‎SPECS/kernel-headers/kernel-headers.spec‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
Summary: Linux API header files
1515
Name: kernel-headers
16-
Version: 6.12.59
17-
Release: 1%{?dist}
16+
Version: 6.12.61
17+
Release: 2%{?dist}
1818
License: GPLv2
1919
Vendor: Intel Corporation
2020
Distribution: Edge Microvisor Toolkit
2121
Group: System Environment/Kernel
2222
URL: https://www.kernel.org/pub/linux/kernel
23-
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.59.tar.gz
23+
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.12.61.tar.gz
2424
# Historical name shipped by other distros
2525
Provides: glibc-kernheaders = %{version}-%{release}
2626
BuildArch: noarch
@@ -41,7 +41,7 @@ cross-glibc package.
4141
%endif
4242

4343
%prep
44-
%setup -q -n linux-6.12.59
44+
%setup -q -n linux-6.12.61
4545

4646
%build
4747
make mrproper
@@ -76,6 +76,13 @@ done
7676
%endif
7777

7878
%changelog
79+
* Fri Jan 9 2026 Lishan Liu <lishan.liu@intel.com> - 6.12.61-2
80+
- Update kernel to 6.12.61-2
81+
- lts-v6.12.61-emt-cve-260106T193826Z
82+
83+
* Fri Jan 2 2026 Lishan Liu <lishan.liu@intel.com> - 6.12.61-1
84+
- Update kernel to 6.12.61-1
85+
7986
* Thu Dec 11 2025 Lishan Liu <lishan.liu@intel.com> - 6.12.59-1
8087
- Update kernel to 6.12.59
8188

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 7190df9cb5fc10c673e960b7144d470fcd373627 Mon Sep 17 00:00:00 2001
2+
From: "Chew, Tong Liang" <tong.liang.chew@intel.com>
3+
Date: Sat, 27 Dec 2025 11:51:55 +0800
4+
Subject: [PATCH] Revert "drm/i915: Do not advertise about CCS"
5+
6+
This reverts commit 1e5d5fbf3f18d0c4b534c431fa71c065ee048a63.
7+
8+
Signed-off-by: Chew, Tong Liang <tong.liang.chew@intel.com>
9+
---
10+
drivers/gpu/drm/i915/i915_query.c | 10 ----------
11+
1 file changed, 10 deletions(-)
12+
13+
diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
14+
index 72201c8d9ecd9..7c6669cc4c96f 100644
15+
--- a/drivers/gpu/drm/i915/i915_query.c
16+
+++ b/drivers/gpu/drm/i915/i915_query.c
17+
@@ -159,16 +159,6 @@ query_engine_info(struct drm_i915_private *i915,
18+
info_ptr = &query_ptr->engines[0];
19+
20+
for_each_uabi_engine(engine, i915) {
21+
- /* Do not advertise CCS is available for selected platforms
22+
- * as CCS is not actually functional on those.
23+
- */
24+
- if ((INTEL_INFO(i915)->platform == INTEL_DG1 ||
25+
- INTEL_INFO(i915)->platform == INTEL_TIGERLAKE ||
26+
- INTEL_INFO(i915)->platform == INTEL_ALDERLAKE_S ||
27+
- INTEL_INFO(i915)->platform == INTEL_ALDERLAKE_P) &&
28+
- engine->uabi_class == I915_ENGINE_CLASS_COMPUTE)
29+
- continue;
30+
-
31+
info.engine.engine_class = engine->uabi_class;
32+
info.engine.engine_instance = engine->uabi_instance;
33+
info.flags = I915_ENGINE_INFO_HAS_LOGICAL_INSTANCE;
34+
--
35+
2.34.1
36+

‎SPECS/kernel-rt/0001-drm-i915-no-force-probe-needed-for-mtl-platform.drm‎

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

0 commit comments

Comments
 (0)