[lfs] 01/01: 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 1605b76dc745577b6453eaa97d33ad485f67f317
Merge: f68f1c829 8f6ef36f7
Author: Xi Ruoyao <[email protected]>
AuthorDate: Sat Aug 23 19:09:44 2025 +0800

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

 chapter01/whatsnew.xml          |  3 ---
 chapter08/bash.xml              | 10 ++++++----
 chapter10/kernel/kernel.version |  2 +-
 chapter10/kernel/systemd.xml    | 13 +++++++------
 chapter10/kernel/sysv.xml       | 13 +++++++------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --cc chapter10/kernel/systemd.xml
index f4e32b701,5a598b764..d187f6abf
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@@ -45,18 -43,17 +45,19 @@@
    <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
      [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
      [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
 +    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
 +      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
    <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+     &lt;*&gt;    <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                        ...  [DRM]
-       [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
+     [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
                                                                  ...  [DRM_PANIC]
-       (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                         [DRM_PANIC_SCREEN]
-       <emphasis role='blue'>S</emphasis>upported DRM clients ---&gt;
-         [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+     (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                           [DRM_PANIC_SCREEN]
+     <emphasis role='blue'>S</emphasis>upported DRM clients ---&gt;
+       [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                        ...  [DRM_FBDEV_EMULATION]
-       &lt;*&gt;    <emphasis role='blue'>S</emphasis>imple framebuffer driver                           [DRM_SIMPLEDRM]
+     <emphasis role='blue'>D</emphasis>rivers for system framebuffers ---&gt;
+       &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
      <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
        [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
  
diff --cc chapter10/kernel/sysv.xml
index 21efc7db0,87e77c30d..e7cbeb9f0
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@@ -32,17 -30,16 +32,18 @@@
                                                             ...  [DEVTMPFS_MOUNT]
    <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
      [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
 +    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
 +      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
    <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+     &lt;*&gt;    <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                        ...  [DRM]
-       [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
+     [*]    <emphasis role='blue'>D</emphasis>isplay a user-friendly message when a kernel panic occurs
                                                                  ...  [DRM_PANIC]
-       (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                         [DRM_PANIC_SCREEN]
-       <emphasis role='blue'>S</emphasis>upported DRM clients ---&gt;
-         [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+     (kmsg)   <emphasis role='blue'>P</emphasis>anic screen formatter                           [DRM_PANIC_SCREEN]
+     <emphasis role='blue'>S</emphasis>upported DRM clients ---&gt;
+       [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                        ...  [DRM_FBDEV_EMULATION]
-       &lt;*&gt;    <emphasis role='blue'>S</emphasis>imple framebuffer driver                           [DRM_SIMPLEDRM]
+     <emphasis role='blue'>D</emphasis>rivers for system framebuffers ---&gt;
+       &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                              [DRM_SIMPLEDRM]
      <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
        [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>

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