From 93bffa3abf3ea177e1eed0d1461388de1c967651 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 9 Aug 2024 15:49:05 +0800
Subject: [PATCH 1/2] Regenerate kernel configuration with Linux 6.10.2 source

Now all DRM drivers are entries in the DRM submenu.
---
 chapter10/kernel/kernel.version | 2 +-
 chapter10/kernel/systemd.xml    | 4 ++--
 chapter10/kernel/sysv.xml       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index dd0026fc1..22cb9e553 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.8.9
+6.10.2
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index 4960796ef..271744b65 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -45,8 +45,8 @@
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-    # If [DRM] is selected as * or M, this must be selected:
-    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
       # If [DRM] is selected as * or M, this must be selected:
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 25cb0c2a6..451898a21 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -31,8 +31,8 @@
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-    # If [DRM] is selected as * or M, this must be selected:
-    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
       # If [DRM] is selected as * or M, this must be selected:

From a18957940ced92d374e4e41e7eefb982d5c55749 Mon Sep 17 00:00:00 2001
From: Andrew Kreimer <algonell@gmail.com>
Date: Fri, 9 Aug 2024 17:01:15 +0300
Subject: [PATCH 2/2] docs: fix a typo

In section "5.3. GCC-13.2.0 - Pass 1",
the string "The are not strictly needed"
should have "They".

Fix that.
---
 chapter05/gcc-pass1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 7f33e5215..6ea6d48b6 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -139,7 +139,7 @@ cd       build</userinput></screen>
         <listitem>
           <para>Those switches allow GCC to compile programs with
            some hardening security features (more information on those in
-           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. The
+           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. They
            are not strictly needed at this stage, since the compiler will
            only produce temporary executables. But it is cleaner to have the
            temporary packages be as close as possible to the final ones.