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

Commit 1e467e68 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 updates from Jonathan Corbet:
 "The main thing here is Ingo's big subdirectory documenting feature
  support for each architecture.  Beyond that, it's the usual pile of
  fixes, tweaks, and small additions"

* tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (79 commits)
  doc:md: fix typo in md.txt.
  Documentation/mic/mpssd: don't build x86 userspace when cross compiling
  Documentation/prctl: don't build tsc tests when cross compiling
  Documentation/vDSO: don't build tests when cross compiling
  Doc:ABI/testing: Fix typo in sysfs-bus-fcoe
  Doc: Docbook: Change wikipedia's URL from http to https in scsi.tmpl
  Doc: Change wikipedia's URL from http to https
  Documentation/kernel-parameters: add missing pciserial to the earlyprintk
  Doc:pps: Fix typo in pps.txt
  kbuild : Fix documentation of INSTALL_HDR_PATH
  Documentation: filesystems: updated struct file_operations documentation in vfs.txt
  kbuild: edit explanation of clean-files variable
  Doc: ja_JP: Fix typo in HOWTO
  Move freefall program from Documentation/ to tools/
  Documentation: ARM: EXYNOS: Describe boot loaders interface
  Doc:nfc: Fix typo in nfc-hci.txt
  vfs: Minor documentation fix
  Doc: networking: txtimestamp: fix printf format warning
  Documentation, intel_pstate: Improve legacy mode internal governors description
  Documentation: extend use case for EXPORT_SYMBOL_GPL()
  ...
parents 14738e03 36f95a0b

Documentation/ABI/testing/sysfs-bus-fcoe

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Description: 'FCoE Controller' instances on the fcoe bus. 


Attributes:



	fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing

	fcf_dev_loss_tmo: Device loss timeout period (see below). Changing

			  this value will change the dev_loss_tmo for all

			  FCFs discovered by this controller.
@@ -61,7 +61,7 @@ Attributes: 
	lesb/err_block:   Link Error Status Block (LESB) block error count.



	lesb/fcs_error:   Link Error Status Block (LESB) Fibre Channel

			  Serivces error count.

			  Services error count.



Notes: ctlr_X (global increment starting at 0)
@@ -85,7 +85,7 @@ Attributes: 
		     fabric.



	selected:    1 indicates that the switch has been selected for use;

		     0 indicates that the swich will not be used.

		     0 indicates that the switch will not be used.



	fc_map:      The Fibre Channel MAP
@@ -93,7 +93,7 @@ Attributes: 


	mac:         The FCF's MAC address



	fka_peroid:  The FIP Keep-Alive peroid

	fka_period:  The FIP Keep-Alive period



	fabric_state: The internal kernel state

		      "Unknown" - Initialization value
@@ -101,9 +101,9 @@ Attributes: 
		      "Connected" - Host is connected to the FCF

		      "Deleted" - FCF is being removed from the system



	dev_loss_tmo: The device loss timeout peroid for this FCF.

	dev_loss_tmo: The device loss timeout period for this FCF.



Notes: A device loss infrastructre similar to the FC Transport's

Notes: A device loss infrastructure similar to the FC Transport's

       is present in fcoe_sysfs. It is nice to have so that a

       link flapping adapter doesn't continually advance the count

       used to identify the discovered FCF. FCFs will exist in a

Documentation/CodingStyle

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ functions: 
	typeof(x) ret;			\

	ret = calc_ret(x);		\

	(ret);				\

)}

})



ret is a common name for a local variable - __foo_ret is less likely

to collide with an existing variable.

Documentation/DMA-API-HOWTO.txt

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ There are two types of DMA mappings: 
  transfer, unmapped right after it (unless you use dma_sync_* below)

  and for which hardware can optimize for sequential accesses.



  This of "streaming" as "asynchronous" or "outside the coherency

  Think of "streaming" as "asynchronous" or "outside the coherency

  domain".



  Good examples of what to use streaming mappings for are:

Documentation/DocBook/kernel-hacking.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -954,6 +954,8 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress); 
    <function>MODULE_LICENSE()</function> that specifies a GPL

    compatible license.  It implies that the function is considered

    an internal implementation issue, and not really an interface.

    Some maintainers and developers may however

    require EXPORT_SYMBOL_GPL() when adding any new APIs or functionality.

   </para>

  </sect1>

 </chapter>

Documentation/DocBook/scsi.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
        SAS, Fibre Channel, FireWire, and ATAPI devices.  SCSI packets are

        also commonly exchanged over Infiniband,

        <ulink url='http://i2o.shadowconnect.com/faq.php'>I20</ulink>, TCP/IP

        (<ulink url='http://en.wikipedia.org/wiki/ISCSI'>iSCSI</ulink>), even

        (<ulink url='https://en.wikipedia.org/wiki/ISCSI'>iSCSI</ulink>), even

        <ulink url='http://cyberelk.net/tim/parport/parscsi.html'>Parallel

        ports</ulink>.

      </para>