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]>
sacnaik · Nov 9, 2022 · 34f26b3 · 34f26b3
1 parent 686b9b1
commit 34f26b3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 147 deletions.
diff --git a/Makefile b/Makefile
@@ -3,9 +3,9 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 KERNEL_ABI_MINOR_VERSION = 2
-KVERSION_SHORT ?= 5.10.0-12-$(KERNEL_ABI_MINOR_VERSION)
+KVERSION_SHORT ?= 5.10.0-18-$(KERNEL_ABI_MINOR_VERSION)
 KVERSION ?= $(KVERSION_SHORT)-amd64
-KERNEL_VERSION ?= 5.10.103
+KERNEL_VERSION ?= 5.10.140
 KERNEL_SUBVERSION ?= 1
 kernel_procure_method ?= build
 CONFIGURED_ARCH ?= amd64

diff --git a/patch/0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch b/patch/0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch
diff --git a/patch/preconfig/disable-building-linux-source-deb-package.patch b/patch/preconfig/disable-building-linux-source-deb-package.patch
@@ -19,8 +19,8 @@ index b6dae911b..50787e0e6 100644
  381bc892fd36ef7ea5327f649b99cb98  debian/templates/sourcebin.meta.maintscript.in
  814dda166c7e3ef02e6e259e805ac66a  debian/templates/tests-control.image.in
  33d71bfd398d2f9b3bc5c0193b67d17e  debian/templates/tests-control.main.in
--d54c376df16977677abfa95bf70cc6b6  debian/config/defines
-+74cca3ef177fb4f21b189a32a3b97b1e  debian/config/defines
+-8d7d8384c63c762538f8a76b60f6ca01  debian/config/defines
++d2c3e206c4cfe309bacbea8692b9acae  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  026ce5cdad7814c28f4fd87589786719  debian/config/amd64/defines
  44bff3917069a99eeb20ceff24609dda  debian/config/arm64/defines
diff --git a/patch/preconfig/packaging-update-abiname.patch b/patch/preconfig/packaging-update-abiname.patch
@@ -14,8 +14,8 @@ index cd4938ecc..e54c10256 100644
 +++ b/debian/config/defines
 @@ -1,5 +1,5 @@
  [abi]
--abiname: 12
-+abiname: 12-2
+-abiname: 18
++abiname: 18-2
  ignore-changes:
   __cpuhp_*
   __udp_gso_segment
@@ -27,8 +27,8 @@ index e86f5f1db..caddd5360 100644
  381bc892fd36ef7ea5327f649b99cb98  debian/templates/sourcebin.meta.maintscript.in
  814dda166c7e3ef02e6e259e805ac66a  debian/templates/tests-control.image.in
  33d71bfd398d2f9b3bc5c0193b67d17e  debian/templates/tests-control.main.in
--601c2559d4800fd0180a6a944c9f74f1  debian/config/defines
-+d54c376df16977677abfa95bf70cc6b6  debian/config/defines
+-eb1d16e5a614c12118ccc36e18c54a69  debian/config/defines
++8d7d8384c63c762538f8a76b60f6ca01  debian/config/defines
  59a811890d2e7129bec940075850f11f  debian/config/alpha/defines
  026ce5cdad7814c28f4fd87589786719  debian/config/amd64/defines
  44bff3917069a99eeb20ceff24609dda  debian/config/arm64/defines
diff --git a/patch/series b/patch/series
@@ -69,7 +69,6 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
 0011-i2c-mux-mlxcpld-Add-callback-to-notify-mux-crea.patch
 0012-hwmon-mlxreg-fan-Add-support-for-fan-drawers-ca.patch
 0013-hwmon-pmbus-shrink-code-and-remove-pmbus_do_rem.patch
-0014-thermal-drivers-core-Use-a-char-pointer-for-the.patch
 0015-mlxsw-core-Remove-critical-trip-points-from-the.patch
 0016-net-don-t-include-ethtool.h-from-netdevice.h.patch
 0017-mlxsw-reg-Extend-MTMP-register-with-new-thresho.patch