Skip to content

Commit 1584edf

Browse files
christophercochristopherco
authored
Revert "kernel: enable CONFIG_LWTUNNEL and CONFIG_SCHED_CORE" (microsoft#15113)
1 parent 52e8126 commit 1584edf

File tree

13 files changed

+15
-37
lines changed

13 files changed

+15
-37
lines changed

‎SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.116.1
10-
Release: 2%{?dist}
10+
Release: 1%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,9 +105,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
109-
- Bump release to match kernel
110-
111108
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
112109
- Auto-upgrade to 6.6.116.1
113110

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.116.1
13-
Release: 2%{?dist}
13+
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,9 +145,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
149-
- Bump release to match kernel
150-
151148
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
152149
- Auto-upgrade to 6.6.116.1
153150

‎SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.116.1
9-
Release: 2%{?dist}
9+
Release: 1%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,9 +68,6 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
72-
- Bump release to match kernel
73-
7471
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
7572
- Auto-upgrade to 6.6.116.1
7673

‎SPECS/kernel-64k/kernel-64k.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Summary: Linux Kernel
2828
Name: kernel-64k
2929
Version: 6.6.116.1
30-
Release: 2%{?dist}
30+
Release: 1%{?dist}
3131
License: GPLv2
3232
Vendor: Microsoft Corporation
3333
Distribution: Azure Linux
@@ -380,9 +380,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
380380
%{_sysconfdir}/bash_completion.d/bpftool
381381

382382
%changelog
383-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
384-
- Bump release to match kernel
385-
386383
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
387384
- Auto-upgrade to 6.6.116.1
388385

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.116.1
17-
Release: 2%{?dist}
17+
Release: 1%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,9 +75,6 @@ done
7575
%endif
7676

7777
%changelog
78-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
79-
- Bump release to match kernel
80-
8178
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
8279
- Auto-upgrade to 6.6.116.1
8380

‎SPECS/kernel/config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ CONFIG_PREEMPT_NONE=y
129129
CONFIG_PREEMPT_COUNT=y
130130
CONFIG_PREEMPTION=y
131131
CONFIG_PREEMPT_DYNAMIC=y
132-
CONFIG_SCHED_CORE=y
132+
# CONFIG_SCHED_CORE is not set
133133

134134
#
135135
# CPU/Task time and stats accounting
@@ -1888,8 +1888,7 @@ CONFIG_CEPH_LIB=m
18881888
# CONFIG_NFC is not set
18891889
# CONFIG_PSAMPLE is not set
18901890
# CONFIG_NET_IFE is not set
1891-
CONFIG_LWTUNNEL=y
1892-
# CONFIG_LWTUNNEL_BPF is not set
1891+
# CONFIG_LWTUNNEL is not set
18931892
CONFIG_DST_CACHE=y
18941893
CONFIG_GRO_CELLS=y
18951894
CONFIG_NET_SELFTESTS=y

‎SPECS/kernel/kernel-uki.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Summary: Unified Kernel Image
1414
Name: kernel-uki
1515
Version: 6.6.116.1
16-
Release: 2%{?dist}
16+
Release: 1%{?dist}
1717
License: GPLv2
1818
Vendor: Microsoft Corporation
1919
Distribution: Azure Linux
@@ -70,9 +70,6 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7070
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7171

7272
%changelog
73-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
74-
- Bump release to match kernel
75-
7673
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
7774
- Auto-upgrade to 6.6.116.1
7875

‎SPECS/kernel/kernel.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config": "96c7b10b58963fe0c048ffe4777347a38e2235ef426a0eb531924fc4042ae63a",
4+
"config": "91a7b22c9d24222b9d3cb78a38bae3ed23c950f0cf8acbe3fa3e353777b8a2a7",
55
"config_aarch64": "67d4a90b045d5ce1501f7ad46b30be115717fd902bd1962e5852ea30b85d7647",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",

‎SPECS/kernel/kernel.spec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
Summary: Linux Kernel
3333
Name: kernel
3434
Version: 6.6.116.1
35-
Release: 2%{?dist}
35+
Release: 1%{?dist}
3636
License: GPLv2
3737
Vendor: Microsoft Corporation
3838
Distribution: Azure Linux
@@ -440,9 +440,6 @@ echo "initrd of kernel %{uname_r} removed" >&2
440440
%{_sysconfdir}/bash_completion.d/bpftool
441441

442442
%changelog
443-
* Fri Nov 14 2025 Hamza Mahfooz <[email protected]> - 6.6.116.1-2
444-
- config: Enable CONFIG_LWTUNNEL and CONFIG_SCHED_CORE
445-
446443
* Mon Nov 10 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.116.1-1
447444
- Auto-upgrade to 6.6.116.1
448445

‎toolkit/resources/manifests/package/pkggen_core_aarch64.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.116.1-2.azl3.noarch.rpm
2+
kernel-headers-6.6.116.1-1.azl3.noarch.rpm
33
glibc-2.38-16.azl3.aarch64.rpm
44
glibc-devel-2.38-16.azl3.aarch64.rpm
55
glibc-i18n-2.38-16.azl3.aarch64.rpm

0 commit comments

Comments
 (0)