---

yaml
---
r: 361863
b: refs/heads/master
c: 3d464d9
h: refs/heads/master
i:
  361861: 292a3b3
  361859: 3a31477
  361855: e1ed650
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c45289f215e137825bf9630d0abb41c1dc41ff
+refs/heads/master: 3d464d9b71ef2f2b40a4bc9dcf06794fd1be9d12

trunk/CREDITS

@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061
 S: USA
 
 N: Randy Dunlap
-E: rdunlap@infradead.org
-W: http://www.infradead.org/~rdunlap/
+E: rdunlap@xenotime.net
+W: http://www.xenotime.net/linux/linux.html
+W: http://www.linux-usb.org
 D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
 D: x86 SMP, ACPI, bootflag hacking
-D: documentation, builds
 S: (ask for current address)
 S: USA
 
@@ -1510,14 +1510,6 @@ D: Natsemi ethernet
 D: Cobalt Networks (x86) support
 D: This-and-That
 
-N: Mark M. Hoffman
-E: mhoffman@lightlink.com
-D: asb100, lm93 and smsc47b397 hardware monitoring drivers
-D: hwmon subsystem core
-D: hwmon subsystem maintainer
-D: i2c-sis96x and i2c-stub SMBus drivers
-S: USA
-
 N: Dirk Hohndel
 E: hohndel@suse.de
 D: The XFree86[tm] Project

trunk/Documentation/00-INDEX

@@ -299,8 +299,6 @@ memory-hotplug.txt
 	- Hotpluggable memory support, how to use and current status.
 memory.txt
 	- info on typical Linux memory problems.
-metag/
-	- directory with info about Linux on Meta architecture.
 mips/
 	- directory with info about Linux on MIPS architecture.
 misc-devices/

trunk/Documentation/ABI/testing/sysfs-bus-fcoe

@@ -1,53 +1,14 @@
-What:		/sys/bus/fcoe/
-Date:		August 2012
-KernelVersion:	TBD
-Contact:	Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
-Description:	The FCoE bus. Attributes in this directory are control interfaces.
-Attributes:
-
-	ctlr_create: 'FCoE Controller' instance creation interface. Writing an
-		     <ifname> to this file will allocate and populate sysfs with a
-		     fcoe_ctlr_device (ctlr_X). The user can then configure any
-		     per-port settings and finally write to the fcoe_ctlr_device's
-		     'start' attribute to begin the kernel's discovery and login
-		     process.
-
-	ctlr_destroy: 'FCoE Controller' instance removal interface. Writing a
-		       fcoe_ctlr_device's sysfs name to this file will log the
-		       fcoe_ctlr_device out of the fabric or otherwise connected
-		       FCoE devices. It will also free all kernel memory allocated
-		       for this fcoe_ctlr_device and any structures associated
-		       with it, this includes the scsi_host.
-
-What:		/sys/bus/fcoe/devices/ctlr_X
+What:		/sys/bus/fcoe/ctlr_X
 Date:		March 2012
 KernelVersion:	TBD
 Contact:	Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
-Description:	'FCoE Controller' instances on the fcoe bus.
-		The FCoE Controller now has a three stage creation process.
-		1) Write interface name to ctlr_create 2) Configure the FCoE
-		Controller (ctlr_X) 3) Enable the FCoE Controller to begin
-		discovery and login. The FCoE Controller is destroyed by
-		writing it's name, i.e. ctlr_X to the ctlr_delete file.
-
+Description:	'FCoE Controller' instances on the fcoe bus
 Attributes:
 
 	fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
 			  this value will change the dev_loss_tmo for all
 			  FCFs discovered by this controller.
 
-	mode:		  Display or change the FCoE Controller's mode. Possible
-			  modes are 'Fabric' and 'VN2VN'. If a FCoE Controller
-			  is started in 'Fabric' mode then FIP FCF discovery is
-			  initiated and ultimately a fabric login is attempted.
-			  If a FCoE Controller is started in 'VN2VN' mode then
-			  FIP VN2VN discovery and login is performed. A FCoE
-			  Controller only supports one mode at a time.
-
-	enabled:	  Whether an FCoE controller is enabled or disabled.
-			  0 if disabled, 1 if enabled. Writing either 0 or 1
-			  to this file will enable or disable the FCoE controller.
-
 	lesb/link_fail:   Link Error Status Block (LESB) link failure count.
 
 	lesb/vlink_fail:  Link Error Status Block (LESB) virtual link
@@ -65,7 +26,7 @@ Attributes:
 
 Notes: ctlr_X (global increment starting at 0)
 
-What:		/sys/bus/fcoe/devices/fcf_X
+What:		/sys/bus/fcoe/fcf_X
 Date:		March 2012
 KernelVersion:	TBD
 Contact:	Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org

trunk/Documentation/DMA-API-HOWTO.txt

@@ -488,10 +488,9 @@ will invoke the generic mapping error check interface. Doing so will ensure
 that the mapping code will work correctly on all dma implementations without
 any dependency on the specifics of the underlying implementation. Using the
 returned address without checking for errors could result in failures ranging
-from panics to silent data corruption. A couple of examples of incorrect ways
-to check for errors that make assumptions about the underlying dma
-implementation are as follows and these are applicable to dma_map_page() as
-well.
+from panics to silent data corruption. Couple of example of incorrect ways to
+check for errors that make assumptions about the underlying dma implementation
+are as follows and these are applicable to dma_map_page() as well.
 
 Incorrect example 1:
 	dma_addr_t dma_handle;
@@ -752,7 +751,7 @@ Example 1:
 		dma_unmap_single(dma_handle1);
 	map_error_handling1:
 
-Example 2: (if buffers are allocated in a loop, unmap all mapped buffers when
+Example 2: (if buffers are allocated a loop, unmap all mapped buffers when
 	    mapping error is detected in the middle)
 
 	dma_addr_t dma_addr;