Skip to content

Commit b95e26a

Browse files
jslobodzianrlmenge
andauthored
Revert "[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.143.1 - b… (#7225)
Co-authored-by: rlmenge <rachelmenge@microsoft.com>
1 parent e8d65b2 commit b95e26a

28 files changed

Lines changed: 50 additions & 86 deletions

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.143.1
12+
Version: 5.15.139.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,9 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156-
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
157-
- Auto-upgrade to 5.15.143.1
158-
159156
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
160157
- Auto-upgrade to 5.15.139.1
161158

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.143.1
7+
Version: 5.15.139.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,9 +149,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152-
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
153-
- Auto-upgrade to 5.15.143.1
154-
155152
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
156153
- Auto-upgrade to 5.15.139.1
157154

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.143.1
12+
Version: 5.15.139.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,9 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156-
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
157-
- Auto-upgrade to 5.15.143.1
158-
159156
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
160157
- Auto-upgrade to 5.15.139.1
161158

SPECS/hyperv-daemons/hyperv-daemons.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
88
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
99
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
10-
"kernel-5.15.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609"
10+
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459"
1111
}
12-
}
12+
}

SPECS/hyperv-daemons/hyperv-daemons.spec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%global udev_prefix 70
99
Summary: Hyper-V daemons suite
1010
Name: hyperv-daemons
11-
Version: 5.15.143.1
11+
Version: 5.15.139.1
1212
Release: 1%{?dist}
1313
License: GPLv2+
1414
Vendor: Microsoft Corporation
@@ -219,9 +219,6 @@ fi
219219
%{_sbindir}/lsvmbus
220220

221221
%changelog
222-
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
223-
- Auto-upgrade to 5.15.143.1
224-
225222
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
226223
- Auto-upgrade to 5.15.139.1
227224

SPECS/kernel-azure/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 5.15.143.1 Kernel Configuration
3+
# Linux/x86_64 5.15.139.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y

SPECS/kernel-azure/config_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.15.143.1 Kernel Configuration
3+
# Linux/arm64 5.15.139.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
66
CONFIG_CC_IS_GCC=y
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
4-
"config": "45071dc4a9dd462158ce094505a59c5eae1848ac1ac929191d27e0fe3bc17bf6",
5-
"config_aarch64": "0f72b3c9e63137680b665ff1df72dbd3c14438308ffc32d577443353b28b996c",
4+
"config": "19c6638e60dd22da56be747f5f606fe4bc2adbe4b577ef5397e89f9d0c4ea87b",
5+
"config_aarch64": "90e2887cacf5b35923a9a743225b6cc727adb19a3a7a174fa9dd7c2f4e78959a",
66
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
7-
"kernel-5.15.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609"
7+
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459"
88
}
9-
}
9+
}

SPECS/kernel-azure/kernel-azure.spec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
Summary: Linux Kernel
2929
Name: kernel-azure
30-
Version: 5.15.143.1
30+
Version: 5.15.139.1
3131
Release: 1%{?dist}
3232
License: GPLv2
3333
Vendor: Microsoft Corporation
@@ -420,9 +420,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
420420
%{_sysconfdir}/bash_completion.d/bpftool
421421

422422
%changelog
423-
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
424-
- Auto-upgrade to 5.15.143.1
425-
426423
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
427424
- Auto-upgrade to 5.15.139.1
428425

SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
2424
rename drivers/net/ethernet/mellanox/mlx5/core/{lag_mp.h => lag/mp.h} (100%)
2525

2626
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
27-
index 63032cd..bf2581b 100644
27+
index 63032cd6efb1..bf2581b43b1f 100644
2828
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
2929
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
3030
@@ -14,7 +14,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o
@@ -46,7 +46,7 @@ index 63032cd..bf2581b 100644
4646
en/mapping.o
4747
mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en_tc.o en/rep/tc.o en/rep/neigh.o \
4848
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
49-
index 303e6e7..fd4d9fb 100644
49+
index cf03297c8471..26be4ed9564b 100644
5050
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
5151
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
5252
@@ -11,8 +11,8 @@
@@ -61,7 +61,7 @@ index 303e6e7..fd4d9fb 100644
6161
struct mlx5e_tc_tun_route_attr {
6262
struct net_device *out_dev;
6363
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
64-
index 78538a1..89a98ed 100644
64+
index 3aa8d0b83d10..8ca1db84ca21 100644
6565
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
6666
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
6767
@@ -67,8 +67,8 @@
@@ -74,12 +74,12 @@ index 78538a1..89a98ed 100644
7474
+#include "lag/mp.h"
7575

7676
#define nic_chains(priv) ((priv)->fs.tc.chains)
77-
77+
#define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)
7878
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
7979
similarity index 99%
8080
rename from drivers/net/ethernet/mellanox/mlx5/core/lag.c
8181
rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
82-
index 5f8b7f3..fa8b7c7 100644
82+
index 57d86d47ec2a..ce41d766e417 100644
8383
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c
8484
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
8585
@@ -38,7 +38,7 @@
@@ -95,7 +95,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.h b/drivers/net/etherne
9595
similarity index 98%
9696
rename from drivers/net/ethernet/mellanox/mlx5/core/lag.h
9797
rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h
98-
index d4bae52..c268663 100644
98+
index d4bae528954e..c268663c89b4 100644
9999
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.h
100100
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h
101101
@@ -5,7 +5,7 @@
@@ -111,7 +111,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethe
111111
similarity index 99%
112112
rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
113113
rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
114-
index 81786a9..17967ed 100644
114+
index 81786a9a424c..17967ed405d8 100644
115115
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
116116
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
117117
@@ -4,7 +4,7 @@
@@ -128,5 +128,5 @@ similarity index 100%
128128
rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h
129129
rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
130130
--
131-
2.34.1
131+
2.25.1
132132

0 commit comments

Comments
 (0)