Skip to content

Commit 34f26b3

Browse files
Linux 5.10.140 update (sonic-net#297)
* Update to linux 5.10.140 Signed-off-by: Saikrishna Arcot <[email protected]> * Removed 0014 mlx patch since it is present in 140 Signed-off-by: Vivek Reddy <[email protected]> Signed-off-by: Saikrishna Arcot <[email protected]> Signed-off-by: Vivek Reddy <[email protected]> Co-authored-by: Vivek Reddy <[email protected]>
1 parent 686b9b1 commit 34f26b3

5 files changed

+8
-147
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ SHELL = /bin/bash
33
.SHELLFLAGS += -e
44

55
KERNEL_ABI_MINOR_VERSION = 2
6-
KVERSION_SHORT ?= 5.10.0-12-$(KERNEL_ABI_MINOR_VERSION)
6+
KVERSION_SHORT ?= 5.10.0-18-$(KERNEL_ABI_MINOR_VERSION)
77
KVERSION ?= $(KVERSION_SHORT)-amd64
8-
KERNEL_VERSION ?= 5.10.103
8+
KERNEL_VERSION ?= 5.10.140
99
KERNEL_SUBVERSION ?= 1
1010
kernel_procure_method ?= build
1111
CONFIGURED_ARCH ?= amd64

patch/0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch

-138
This file was deleted.

patch/preconfig/disable-building-linux-source-deb-package.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ index b6dae911b..50787e0e6 100644
1919
381bc892fd36ef7ea5327f649b99cb98 debian/templates/sourcebin.meta.maintscript.in
2020
814dda166c7e3ef02e6e259e805ac66a debian/templates/tests-control.image.in
2121
33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in
22-
-d54c376df16977677abfa95bf70cc6b6 debian/config/defines
23-
+74cca3ef177fb4f21b189a32a3b97b1e debian/config/defines
22+
-8d7d8384c63c762538f8a76b60f6ca01 debian/config/defines
23+
+d2c3e206c4cfe309bacbea8692b9acae debian/config/defines
2424
59a811890d2e7129bec940075850f11f debian/config/alpha/defines
2525
026ce5cdad7814c28f4fd87589786719 debian/config/amd64/defines
2626
44bff3917069a99eeb20ceff24609dda debian/config/arm64/defines

patch/preconfig/packaging-update-abiname.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ index cd4938ecc..e54c10256 100644
1414
+++ b/debian/config/defines
1515
@@ -1,5 +1,5 @@
1616
[abi]
17-
-abiname: 12
18-
+abiname: 12-2
17+
-abiname: 18
18+
+abiname: 18-2
1919
ignore-changes:
2020
__cpuhp_*
2121
__udp_gso_segment
@@ -27,8 +27,8 @@ index e86f5f1db..caddd5360 100644
2727
381bc892fd36ef7ea5327f649b99cb98 debian/templates/sourcebin.meta.maintscript.in
2828
814dda166c7e3ef02e6e259e805ac66a debian/templates/tests-control.image.in
2929
33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in
30-
-601c2559d4800fd0180a6a944c9f74f1 debian/config/defines
31-
+d54c376df16977677abfa95bf70cc6b6 debian/config/defines
30+
-eb1d16e5a614c12118ccc36e18c54a69 debian/config/defines
31+
+8d7d8384c63c762538f8a76b60f6ca01 debian/config/defines
3232
59a811890d2e7129bec940075850f11f debian/config/alpha/defines
3333
026ce5cdad7814c28f4fd87589786719 debian/config/amd64/defines
3434
44bff3917069a99eeb20ceff24609dda debian/config/arm64/defines

patch/series

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
6969
0011-i2c-mux-mlxcpld-Add-callback-to-notify-mux-crea.patch
7070
0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-ca.patch
7171
0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_rem.patch
72-
0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch
7372
0015-mlxsw-core-Remove-critical-trip-points-from-the.patch
7473
0016-net-don-t-include-ethtool.h-from-netdevice.h.patch
7574
0017-mlxsw-reg-Extend-MTMP-register-with-new-thresho.patch

0 commit comments

Comments
 (0)