Skip to content

Commit 3158031

Browse files
Update to Linux 5.10.179 (sonic-net#328)
* Update to Linux 5.10.179 One patch needed some changes; all other patches are unchanged. Signed-off-by: Saikrishna Arcot <[email protected]> * Fix kversion Signed-off-by: Saikrishna Arcot <[email protected]> * Update to 5.10.179-3. Signed-off-by: Saikrishna Arcot <[email protected]> * Disable 6 Mellanox patches as those changes are already included Signed-off-by: Saikrishna Arcot <[email protected]> * Remove Mellanox patches that are not required for 5.10.179 --------- Signed-off-by: Saikrishna Arcot <[email protected]> Co-authored-by: Vivek Reddy <[email protected]>
1 parent fa40db7 commit 3158031

5 files changed

+15
-21
lines changed

Makefile

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

55
KERNEL_ABI_MINOR_VERSION = 2
6-
KVERSION_SHORT ?= 5.10.0-18-$(KERNEL_ABI_MINOR_VERSION)
6+
KVERSION_SHORT ?= 5.10.0-23-$(KERNEL_ABI_MINOR_VERSION)
77
KVERSION ?= $(KVERSION_SHORT)-amd64
8-
KERNEL_VERSION ?= 5.10.140
9-
KERNEL_SUBVERSION ?= 1
8+
KERNEL_VERSION ?= 5.10.179
9+
KERNEL_SUBVERSION ?= 3
1010
kernel_procure_method ?= build
1111
CONFIGURED_ARCH ?= amd64
1212
CONFIGURED_PLATFORM ?= vs

patch/driver-arista-mmcblk-not-working-on-AMD-platforms.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ index bf04a08ee..c10790dd6 100644
4242
--- a/drivers/mmc/host/sdhci-pci-core.c
4343
+++ b/drivers/mmc/host/sdhci-pci-core.c
4444
@@ -1791,8 +1791,13 @@ static int amd_probe(struct sdhci_pci_chip *chip)
45-
}
46-
}
45+
46+
pci_dev_put(smbus_dev);
4747

4848
- if (gen == AMD_CHIPSET_BEFORE_ML || gen == AMD_CHIPSET_CZ)
4949
+ dev_info(&chip->pdev->dev, "identified AMD generation %d chip\n", gen);
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Don't build the linux source package. We don't use it.
22

33
diff --git a/debian/config/defines b/debian/config/defines
4-
index fea89d3b2..7c1d06ad2 100644
4+
index 55d7e51a7..d0bd92833 100644
55
--- a/debian/config/defines
66
+++ b/debian/config/defines
77
@@ -171,3 +171,6 @@ gcc-10: gcc-10 <!stage1 !cross !pkg.linux.nokernel>, gcc-10-@gnu-type-package@ <
@@ -12,15 +12,15 @@ index fea89d3b2..7c1d06ad2 100644
1212
+[packages]
1313
+source: false
1414
diff --git a/debian/control.md5sum b/debian/control.md5sum
15-
index b6dae911b..50787e0e6 100644
15+
index 7d4eabf04..30b3c66a3 100644
1616
--- a/debian/control.md5sum
1717
+++ b/debian/control.md5sum
1818
@@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415 debian/templates/image.prerm.in
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-
-8d7d8384c63c762538f8a76b60f6ca01 debian/config/defines
23-
+d2c3e206c4cfe309bacbea8692b9acae debian/config/defines
22+
-4f47bd3f3f88986bd6cb2bd9c006d6aa debian/config/defines
23+
+c133f81fd44189940d8a695508ae2221 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

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ From: Olivier Singla <[email protected]>
99
2 files changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/debian/config/defines b/debian/config/defines
12-
index cd4938ecc..e54c10256 100644
12+
index 983625720..55d7e51a7 100644
1313
--- a/debian/config/defines
1414
+++ b/debian/config/defines
1515
@@ -1,5 +1,5 @@
1616
[abi]
17-
-abiname: 18
18-
+abiname: 18-2
17+
-abiname: 23
18+
+abiname: 23-2
1919
ignore-changes:
2020
__cpuhp_*
2121
__udp_gso_segment
2222
diff --git a/debian/control.md5sum b/debian/control.md5sum
23-
index e86f5f1db..caddd5360 100644
23+
index b3ce4f58d..7d4eabf04 100644
2424
--- a/debian/control.md5sum
2525
+++ b/debian/control.md5sum
2626
@@ -38,7 +38,7 @@ afb508873a44a1f196c2a525fec4b415 debian/templates/image.prerm.in
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-
-eb1d16e5a614c12118ccc36e18c54a69 debian/config/defines
31-
+8d7d8384c63c762538f8a76b60f6ca01 debian/config/defines
30+
-a488ddf3e8386253351268ac9218622f debian/config/defines
31+
+4f47bd3f3f88986bd6cb2bd9c006d6aa debian/config/defines
3232
59a811890d2e7129bec940075850f11f debian/config/alpha/defines
3333
026ce5cdad7814c28f4fd87589786719 debian/config/amd64/defines
3434
44bff3917069a99eeb20ceff24609dda debian/config/arm64/defines

patch/series

-6
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,6 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
177177
0178-platform-mellanox-Introduce-support-for-next-generat.patch
178178
0180-hwmon-pmbus-Fix-sensors-readouts-for-MPS-Multi-phase.patch
179179
0186-platform-mellanox-mlxreg-hotplug-Allow-more-flexible.patch
180-
0195-platform-x86-MLX_PLATFORM-select-REGMAP-instead-of-d.patch
181-
0201-i2c-mlxbf-incorrect-base-address-passed-during-io-wr.patch
182-
0202-i2c-mlxbf-prevent-stack-overflow-in-mlxbf_i2c_smbus_.patch
183-
0204-i2c-mlxbf-Fix-frequency-calculation.patch
184-
0205-i2c-mlxbf-support-lock-mechanism.patch
185-
0265-hwmon-mlxreg-fan-Return-zero-speed-for-broken-fan.patch
186180
0285-platform-mellanox-nvsw-sn2201-change-fans-i2c-busses.patch
187181
###-> mellanox_hw_mgmt-end
188182

0 commit comments

Comments
 (0)