[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: firmware: intel-microcode: update to 20240531 generic: fitblk: typo in dmesg output
zesming · Jul 6, 2024 · 1245007 · 1245007
2 parents ad24df3 + 34a261f
commit 1245007
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=intel-microcode
-PKG_VERSION:=20240312
+PKG_VERSION:=20240531
 PKG_RELEASE:=1
 
 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz
 PKG_SOURCE_URL:=@DEBIAN/pool/non-free-firmware/i/intel-microcode/
-PKG_HASH:=25f53bab1bf0c84aba927a77a97a9f1147c94199fa95b5187d874f839f022808
+PKG_HASH:=808cbb57a790dab7060b59b31e70e54ac47d3798d75e9784ed57a65b9f951fc4
 PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1
 PKG_CPE_ID:=cpe:/a:intel:microcode
 

diff --git a/target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch b/target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch
@@ -645,7 +645,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +	    (imgmaxsect + MIN_FREE_SECT) < dsectors) {
 +		add_fit_subimage_device(bdev, slot++, imgmaxsect,
 +					dsectors - imgmaxsect, false);
-+		dev_info(dev, "mapped remaing space as /dev/fitrw\n");
++		dev_info(dev, "mapped remaining space as /dev/fitrw\n");
 +	}
 +
 +out_bootconf:

diff --git a/target/linux/generic/pending-6.6/510-block-add-uImage.FIT-subimage-block-driver.patch b/target/linux/generic/pending-6.6/510-block-add-uImage.FIT-subimage-block-driver.patch
@@ -668,7 +668,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +	    (imgmaxsect + MIN_FREE_SECT) < dsectors) {
 +		add_fit_subimage_device(bdev, slot++, imgmaxsect,
 +					dsectors - imgmaxsect, false);
-+		dev_info(dev, "mapped remaing space as /dev/fitrw\n");
++		dev_info(dev, "mapped remaining space as /dev/fitrw\n");
 +	}
 +
 +out_bootconf: