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

Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull documentation updates from Jiri Kosina:
 "I am currently relaying documentation patches through 'doc' branch of
  trivial tree, until Rob, the new documentation maintainer, has
  established a proper tree."

* 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  doc: ext3: update documentation with barrier=1 default
  Documentation/initrd.txt: Change the location of util-linux
  Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl
  Documentation/kernel-parameters: remove autotest and mcatest
parents 905cec41 21848d08

Documentation/SubmittingPatches

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ be able to justify all violations that remain in your patch. 


Look through the MAINTAINERS file and the source code, and determine

if your change applies to a specific subsystem of the kernel, with

an assigned maintainer.  If so, e-mail that person.

an assigned maintainer.  If so, e-mail that person.  The script

scripts/get_maintainer.pl can be very useful at this step.



If no maintainer is listed, or the maintainer does not respond, send

your patch to the primary Linux kernel developer's mailing list,

Documentation/initrd.txt

+2 −2
Original line number Diff line number Diff line
@@ -362,5 +362,5 @@ Resources 
    http://www.almesberger.net/cv/papers/ols2k-9.ps.gz

[2] newlib package (experimental), with initrd example

    http://sources.redhat.com/newlib/

[3] Brouwer, Andries; "util-linux: Miscellaneous utilities for Linux"

    ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/
 
[3] util-linux: Miscellaneous utilities for Linux

    http://www.kernel.org/pub/linux/utils/util-linux/

Documentation/kernel-parameters.txt

+0 −4
Original line number Diff line number Diff line
@@ -397,8 +397,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	atkbd.softrepeat= [HW]

			Use software keyboard repeat



	autotest	[IA-64]



	baycom_epp=	[HW,AX25]

			Format: <io>,<mode>
@@ -1453,8 +1451,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			devices can be requested on-demand with the

			/dev/loop-control interface.



	mcatest=	[IA-64]



	mce		[X86-32] Machine Check Exception



	mce=option	[X86-64] See Documentation/x86/x86_64/boot-options.txt

CRA Git | Maintained and supported by SUSTech CRA and CCSE