1 files changed, 51 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 81aa63c57..e80e76afc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,54 @@
+Sat Jan  7 20:30:44 UTC 2023
+We're going to go ahead and jump to the 6.1.4 kernel, in spite of the fact
+that a kernel bisect identified the patch that was preventing 32-bit from
+booting here on a Thinkpad X1E:
+
+------
+From 2e479b3b82c49bfb9422274c0a9c155a41caecb7 Mon Sep 17 00:00:00 2001
+From: Michael Kelley <mikelley@microsoft.com>
+Date: Wed, 16 Nov 2022 10:41:24 -0800
+Subject: [PATCH] x86/ioremap: Fix page aligned size calculation in
+ __ioremap_caller()
+
+commit 4dbd6a3e90e03130973688fd79e19425f720d999 upstream.
+
+Current code re-calculates the size after aligning the starting and
+ending physical addresses on a page boundary. But the re-calculation
+also embeds the masking of high order bits that exceed the size of
+the physical address space (via PHYSICAL_PAGE_MASK). If the masking
+removes any high order bits, the size calculation results in a huge
+value that is likely to immediately fail.
+
+Fix this by re-calculating the page-aligned size first. Then mask any
+high order bits using PHYSICAL_PAGE_MASK.
+
+Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in
+PAE mode")
+------
+
+The non-SMP non-PAE 32-bit kernel is fine even without the patch revert.
+The PAE kernel also works fine with this patch reverted without any need
+to revert ffa71f33a820 (the patch that this one is supposed to fix). The
+machine's excessive (for 32-bit) amount of physical RAM (64GB) might also
+be a factor here considering the PAE kernel works on all the other machines
+around here without reverting this patch.
+The patch is reverted only on 32-bit. Upstream report still pending.
+Enjoy! :-)
+
+a/kernel-generic-6.1.4-x86_64-1.txz:  Upgraded.
+a/kernel-huge-6.1.4-x86_64-1.txz:  Upgraded.
+a/kernel-modules-6.1.4-x86_64-1.txz:  Upgraded.
+a/tree-2.1.0-x86_64-1.txz:  Upgraded.
+d/kernel-headers-6.1.4-x86-1.txz:  Upgraded.
+k/kernel-source-6.1.4-noarch-1.txz:  Upgraded.
+l/gvfs-1.50.3-x86_64-1.txz:  Upgraded.
+l/hunspell-1.7.2-x86_64-1.txz:  Upgraded.
+l/libnice-0.1.21-x86_64-1.txz:  Upgraded.
+n/tin-2.6.2-x86_64-1.txz:  Upgraded.
+isolinux/initrd.img:  Rebuilt.
+kernels/*:  Upgraded.
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
++--------------------------+
 Sat Jan  7 01:50:00 UTC 2023
 a/btrfs-progs-6.1.2-x86_64-1.txz:  Upgraded.
 l/mozilla-nss-3.87-x86_64-1.txz:  Upgraded.