[lfs] 01/01: Merge branch 'trunk' into multilib

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

git pushed a commit to branch multilib
in repository lfs.

commit 0710f64a319c29c2b66243d27539cfb9496e487d
Merge: d5dd2ca33 ffc4af1d6
Author: Zeckmathederg <[email protected]>
AuthorDate: Sun Dec 14 16:03:40 2025 -0700

    Merge branch 'trunk' into multilib

 chapter01/changelog.xml | 26 ++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  4 ++--
 packages.ent            | 36 ++++++++++++++++++------------------
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --cc packages.ent
index 33169e3a9,c3c27eea0..d454c96ad
--- a/packages.ent
+++ b/packages.ent
@@@ -431,19 -421,15 +431,19 @@@
  <!ENTITY libxcrypt-fin-du "12 MB">
  <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
  
 +<!--
 +  The linux-base + patch variant will constantly cause
 +  merge conflicts here.
 +-->
  <!ENTITY linux-major-version "6">
- <!ENTITY linux-minor-version "17">
+ <!ENTITY linux-minor-version "18">
  <!ENTITY linux-majmin-version "&linux-major-version;.&linux-minor-version;">
- <!ENTITY linux-patch-version "9">
+ <!ENTITY linux-patch-version "1">
  <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
  <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
- <!ENTITY linux-size "149,817 KB">
+ <!ENTITY linux-size "150,669 KB">
  <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
- <!ENTITY linux-md5 "512f1c964520792d9337f43b9177b181">
+ <!ENTITY linux-md5 "b73df036a1896e97c008323a9c50b546">
  <!ENTITY linux-home "https://www.kernel.org/">
  <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
   minimum is allnoconfig 

-- 
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