Commit 4f080f05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6 

Pull documentation fixes from Jonathan Corbet:
 "So this is my first pull request since I rashly agreed to look after
  the documentation subtree.  It contains some typo fixes, a few minor
  documentation improvements, and, most importantly, fixes for a couple
  of build problems in various bits of sample code.

  I fully intend to start sending pull requests with signed tags.
  However, due to poor planning on my part and the general obnoxiousness
  of life, I'm 2000 miles away from my private key which is sitting on a
  powered-down machine.  This should be fixed before my next request.

  Meanwhile git.lwn.net is a machine under my control, the patches are
  all trivial, and all have done time in linux-next"

* tag 'docs-for-linus' of git://git.lwn.net/linux-2.6:
  Documentation/SubmittingPatches: Reported-by tags and permission
  Documentation: remove outdated references to the linux-next wiki
  Documentation: Restrict TSC test code to x86
  doc: kernel-parameters.txt: Add ide-generic.probe-mask
  vdso: don't require 64-bit math in standalone test
  Documentation: Add CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF case
  Documentation: Add default kmemleak off case in kernel-parameters.txt
  Docs: Document that the sticky bit is understood by hugetlbfs
  DocBook: Reduce noise from make cleandocs
  Documentation: fix vdso_standalone_test_x86 on 32-bit
  Documentation: dt-bindings: Explain order in patch series
  Documentation/ABI/testing/sysfs-ibft: fix a typo
parents 69a91c23 d75ef707

Documentation/ABI/testing/sysfs-ibft

+1 −1
Original line number Diff line number Diff line
@@ -20,4 +20,4 @@ Date: November 2007 
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/ethernetX directory will contain

		files that expose the iSCSI Boot Firmware Table NIC data.

		This can this can the IP address, MAC, and gateway of the NIC.
 
		Usually this contains the IP address, MAC, and gateway of the NIC.

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) 
PHONY += cleanmediadocs



cleanmediadocs:

	-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null

	-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null



$(obj)/media_api.xml: $(GENFILES) FORCE

Documentation/HOWTO

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special 
testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git

	http://linux.f-seidel.de/linux-next/pmwiki/



This way, the -next kernel gives a summary outlook onto what will be

expected to go into the mainline kernel at the next merge period.

Documentation/SubmittingPatches

+4 −6
Original line number Diff line number Diff line
@@ -483,12 +483,10 @@ have been included in the discussion 


14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:



If this patch fixes a problem reported by somebody else, consider adding a

Reported-by: tag to credit the reporter for their contribution.  Please

note that this tag should not be added without the reporter's permission,

especially if the problem was not reported in a public forum.  That said,

if we diligently credit our bug reporters, they will, hopefully, be

inspired to help us again in the future.

The Reported-by tag gives credit to people who find bugs and report them and it

hopefully inspires them to help us again in the future.  Please note that if

the bug was reported in private, then ask for permission first before using the

Reported-by tag.



A Tested-by: tag indicates that the patch has been successfully tested (in

some environment) by the person named.  This tag informs maintainers that

Documentation/development-process/2.Process

+0 −4
Original line number Diff line number Diff line
@@ -289,10 +289,6 @@ lists when they are assembled; they can be downloaded from: 


	http://www.kernel.org/pub/linux/kernel/next/



Some information about linux-next has been gathered at:



	http://linux.f-seidel.de/linux-next/pmwiki/



Linux-next has become an integral part of the kernel development process;

all patches merged during a given merge window should really have found

their way into linux-next some time before the merge window opens.