Commit cbd6ac38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-6.4-fixes' of git://git.lwn.net/linux 

Pull documentation fixes from Jonathan Corbet:
 "Four straightforward documentation fixes"

* tag 'docs-6.4-fixes' of git://git.lwn.net/linux:
  Documentation/filesystems: ramfs-rootfs-initramfs: use :Author:
  Documentation/filesystems: sharedsubtree: add section headings
  docs: quickly-build-trimmed-linux: various small fixes and improvements
  Documentation: use capitalization for chapters and acronyms
parents ac92c279 bd415b5c

Documentation/admin-guide/quickly-build-trimmed-linux.rst

+27 −22
Original line number Diff line number Diff line
@@ -215,12 +215,14 @@ again. 
   reduce the compile time enormously, especially if you are running an

   universal kernel from a commodity Linux distribution.



   There is a catch: the make target 'localmodconfig' will disable kernel

   features you have not directly or indirectly through some program utilized

   since you booted the system. You can reduce or nearly eliminate that risk by

   using tricks outlined in the reference section; for quick testing purposes

   that risk is often negligible, but it is an aspect you want to keep in mind

   in case your kernel behaves oddly.

   There is a catch: 'localmodconfig' is likely to disable kernel features you

   did not use since you booted your Linux -- like drivers for currently

   disconnected peripherals or a virtualization software not haven't used yet.

   You can reduce or nearly eliminate that risk with tricks the reference

   section outlines; but when building a kernel just for quick testing purposes

   it is often negligible if such features are missing. But you should keep that

   aspect in mind when using a kernel built with this make target, as it might

   be the reason why something you only use occasionally stopped working.



   [:ref:`details<configuration>`]
@@ -271,6 +273,9 @@ again. 
   does nothing at all; in that case you have to manually install your kernel,

   as outlined in the reference section.



   If you are running a immutable Linux distribution, check its documentation

   and the web to find out how to install your own kernel there.



   [:ref:`details<install>`]



.. _another_sbs:
@@ -291,29 +296,29 @@ again. 
   version you care about, as git otherwise might retrieve the entire commit

   history::



     git fetch --shallow-exclude=v6.1 origin



   If you modified the sources (for example by applying a patch), you now need

   to discard those modifications; that's because git otherwise will not be able

   to switch to the sources of another version due to potential conflicting

   changes::



     git reset --hard

     git fetch --shallow-exclude=v6.0 origin



   Now checkout the version you are interested in, as explained above::

   Now switch to the version you are interested in -- but be aware the command

   used here will discard any modifications you performed, as they would

   conflict with the sources you want to checkout::



     git checkout --detach origin/master

     git checkout --force --detach origin/master



   At this point you might want to patch the sources again or set/modify a build

   tag, as explained earlier; afterwards adjust the build configuration to the

   new codebase and build your next kernel::

   tag, as explained earlier. Afterwards adjust the build configuration to the

   new codebase using olddefconfig, which will now adjust the configuration file

   you prepared earlier using localmodconfig  (~/linux/.config) for your next

   kernel::



     # reminder: if you want to apply patches, do it at this point

     # reminder: you might want to update your build tag at this point

     make olddefconfig



   Now build your kernel::



     make -j $(nproc --all)



   Install the kernel as outlined above::

   Afterwards install the kernel as outlined above::



     command -v installkernel && sudo make modules_install install
@@ -584,10 +589,10 @@ versions and individual commits at hand at any time:: 
    curl -L \

      https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/clone.bundle \

      -o linux-stable.git.bundle

    git clone clone.bundle ~/linux/

    git clone linux-stable.git.bundle ~/linux/

    rm linux-stable.git.bundle

    cd ~/linux/

    git remote set-url origin

    git remote set-url origin \

      https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git

    git fetch origin

    git checkout --detach origin/master

Documentation/cdrom/index.rst

+3 −3
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=====

cdrom

=====

======

CD-ROM

======



.. toctree::

    :maxdepth: 1

Documentation/filesystems/ramfs-rootfs-initramfs.rst

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ Ramfs, rootfs and initramfs 


October 17, 2005



Rob Landley <rob@landley.net>

=============================

:Author: Rob Landley <rob@landley.net>



What is ramfs?

--------------

Documentation/filesystems/sharedsubtree.rst

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ replicas continue to be exactly same. 




3) Setting mount states

-----------------------



	The mount command (util-linux package) can be used to set mount

	states::
@@ -612,6 +613,7 @@ replicas continue to be exactly same. 




6) Quiz

-------



	A. What is the result of the following command sequence?
@@ -673,6 +675,7 @@ replicas continue to be exactly same. 
		/mnt/1/test be?



7) FAQ

------



	Q1. Why is bind mount needed? How is it different from symbolic links?

		symbolic links can get stale if the destination mount gets
@@ -841,6 +844,7 @@ replicas continue to be exactly same. 
			     tmp  usr tmp usr tmp usr



8) Implementation

-----------------



8A) Datastructure

Documentation/fpga/index.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



====

fpga

FPGA

====



.. toctree::