Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ebe0ee8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation update from Jon Corbet:
 "There is a nice new document from Neil on how pathname lookups work
  and some new CAN driver documentation.  Beyond that, we have
  kernel-doc fixes, a bit more work to support reproducible builds, and
  the usual collection of small fixes"

* tag 'docs-for-linus' of git://git.lwn.net/linux: (34 commits)
  Documentation: add new description of path-name lookup.
  Documentation/vm/slub.txt: document slabinfo-gnuplot.sh
  Doc: ABI/stable: Fix typo in ABI/stable
  doc: Clarify that nmi_watchdog param is for hardlockups
  Typo correction for description in gpio document.
  DocBook: Fix kernel-doc to be case-insensitive for private:
  kernel-docs.txt: update kernelnewbies reference
  Doc:kvm: Fix typo in Doc/virtual/kvm
  Documentation/Changes: Add bc in "Current Minimal Requirements" section
  Documentation/email-clients.txt: remove trailing whitespace
  DocBook: Use a fixed encoding for output
  MAINTAINERS: The docs tree has moved
  Docs/kernel-parameters: Add earlycon devicetree usage
  SubmittingPatches: make Subject examples match the de facto standard
  Documentation: gpio: mention that <function>-gpio has been deprecated
  Documentation: cgroups: just fix a few typos
  Documentation: Update kselftest.txt
  Documentation: DMA API: Be more explicit that nents is always the same
  Documentation: Update the default value of crashkernel low
  zram: update documentation
  ...
parents 1873499e 3ce96239

Documentation/ABI/stable/sysfs-class-tpm

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ Description: The "pubek" property will return the TPM's public endorsement 
		owner's authorization. Since the TPM driver doesn't store any

		secrets, it can't authorize its own request for the pubek,

		making it unaccessible. The public endorsement key is gener-

		ated at TPM menufacture time and exists for the life of the

		ated at TPM manufacture time and exists for the life of the

		chip.



		Example output:
@@ -163,7 +163,7 @@ Date: April 2006 
KernelVersion:	2.6.17

Contact:	tpmdd-devel@lists.sf.net

Description:	The "temp_deactivated" property returns a '1' if the chip has

		been temporarily dectivated, usually until the next power

		been temporarily deactivated, usually until the next power

		cycle. Whether a warm boot (reboot) will clear a TPM chip

		from a temp_deactivated state is platform specific.

Documentation/ABI/stable/sysfs-firmware-opal-elog

+1 −1
Original line number Diff line number Diff line
@@ -57,4 +57,4 @@ Description: 
				Shortly after acknowledging it, the log

				entry will be removed from sysfs.

				Reading this file will list the supported

				operations (curently just acknowledge).
 
 No newline at end of file
 
				operations (currently just acknowledge).

Documentation/Changes

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ o grub 0.93 # grub --version || grub-insta 
o  mcelog                 0.6                     # mcelog --version

o  iptables               1.4.2                   # iptables -V

o  openssl & libcrypto    1.0.0                   # openssl version

o  bc                     1.06.95                 # bc --version





Kernel compilation

Documentation/DMA-API-HOWTO.txt

+5 −0
Original line number Diff line number Diff line
@@ -681,6 +681,11 @@ or: 


as appropriate.



PLEASE NOTE:  The 'nents' argument to dma_sync_sg_for_cpu() and

	      dma_sync_sg_for_device() must be the same passed to

	      dma_map_sg(). It is _NOT_ the count returned by

	      dma_map_sg().



After the last DMA transfer call one of the DMA unmap routines

dma_unmap_{single,sg}(). If you don't touch the data from the first

dma_map_*() call till dma_unmap_*(), then you don't have to call the

Documentation/DMA-API.txt

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ accessed sg->address and sg->length as shown above. 


	void

	dma_unmap_sg(struct device *dev, struct scatterlist *sg,

		int nhwentries, enum dma_data_direction direction)

		int nents, enum dma_data_direction direction)



Unmap the previously mapped scatter/gather list.  All the parameters

must be the same as those and passed in to the scatter/gather mapping
@@ -356,10 +356,10 @@ void 
dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,

			   enum dma_data_direction direction)

void

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,

		    enum dma_data_direction direction)

void

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,

		       enum dma_data_direction direction)



Synchronise a single contiguous or scatter/gather mapping for the CPU