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

Merge branch 'docs' of git://git.lwn.net/linux-2.6 

* 'docs' of git://git.lwn.net/linux-2.6:
  Document panic_on_unrecovered_nmi sysctl
  Add a reference to paper to SubmittingPatches
  Add kerneldoc documentation for new printk format extensions
  Remove videobook.tmpl
  doc: Test-by?
  Add the development process document
  Documentation/block/data-integrity.txt: Fix section numbers
parents c472273f 656e6c00

Documentation/00-INDEX

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ Changes 
	- list of changes that break older software packages.

CodingStyle

	- how the boss likes the C code in the kernel to look.

development-process/

	- An extended tutorial on how to work with the kernel development

	  process.

DMA-API.txt

	- DMA API, pci_ API & extensions for non-consistent memory machines.

DMA-ISA-LPC.txt

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.



DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \

DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

Documentation/DocBook/videobook.tmpl

deleted100644 → 0
+0 −1654

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ person it names. This tag documents that potentially interested parties 
have been included in the discussion





14) Using Test-by: and Reviewed-by:

14) Using Tested-by: and Reviewed-by:



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/block/data-integrity.txt

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ will require extra work due to the application tag. 
      retrieve the tag buffer using bio_integrity_get_tag().





6.3 PASSING EXISTING INTEGRITY METADATA

5.3 PASSING EXISTING INTEGRITY METADATA



    Filesystems that either generate their own integrity metadata or

    are capable of transferring IMD from user space can use the
@@ -283,7 +283,7 @@ will require extra work due to the application tag. 
      integrity upon completion.





6.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY

5.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY

    METADATA



    To enable integrity exchange on a block device the gendisk must be

CRA Git | Maintained and supported by SUSTech CRA and CCSE