[lfs] 01/02: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit c4bf90b7bff6fdfa286f7cc556178dfe2725e506
Merge: 6f6d17e07 e3bd8b4a0
Author: Xi Ruoyao <[email protected]>
AuthorDate: Fri Jan 16 10:12:45 2026 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 appendices/dependencies.xml     |  4 +--
 chapter01/changelog.xml         | 56 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml          | 16 ++++-----
 chapter07/createfiles.xml       | 13 +++----
 chapter08/shadow.xml            | 47 +++++++++++++++++++------
 chapter10/kernel.xml            |  7 ++++
 chapter10/kernel/highmem.toml   |  1 +
 chapter10/kernel/highmem.xml    |  7 ++++
 chapter10/kernel/kernel.version |  2 +-
 chapter10/kernel/systemd.xml    |  3 +-
 general.ent                     |  2 +-
 packages.ent                    | 76 ++++++++++++++++++++---------------------
 12 files changed, 165 insertions(+), 69 deletions(-)

diff --cc chapter10/kernel.xml
index e4fb30753,66e58f46b..b73223810
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@@ -140,7 -140,24 +140,14 @@@
  
        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="kernel/systemd.xml"/>
 -   
 -      <para>Enable some additional features if you are building a 64-bit
 -      system.  If you are using menuconfig, enable them in the order of
 -      <parameter>CONFIG_PCI_MSI</parameter> first, then
 -      <parameter>CONFIG_IRQ_REMAP</parameter>, at last
 -      <parameter>CONFIG_X86_X2APIC</parameter> because an option only
 -      shows up after its dependencies are selected.</para>
 -
 -      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 -        href="kernel/x2apic.xml"/>
  
+       <para>If you are building a 32-bit system,
+       adjust the configuration so the kernel will
+       be able to use up to 4GB physical RAM:</para>
+ 
+       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+         href="kernel/highmem.xml"/>
+ 
        <para>If the partition for the LFS system is in a NVME SSD (i. e. the
        device node for the partition is <filename>/dev/nvme*</filename>
        instead of <filename>/dev/sd*</filename>), enable NVME support or

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page