---

yaml
---
r: 360306
b: refs/heads/master
c: 16245bd
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 986248993d495aebffcdf0758ce28ab85aa4e9ff
+refs/heads/master: 16245bdc9d3e22d1460341a655c8b5288953bc14

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/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt → trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt

@@ -1,13 +1,10 @@
-Marvell Armada 370 and Armada XP Timers
----------------------------------------
+Marvell Armada 370 and Armada XP Global Timers
+----------------------------------------------
 
 Required properties:
 - compatible: Should be "marvell,armada-370-xp-timer"
-- interrupts: Should contain the list of Global Timer interrupts and
-  then local timer interrupts
-- reg: Should contain location and length for timers register. First
-  pair for the Global Timer registers, second pair for the
-  local/private timers.
+- interrupts: Should contain the list of Global Timer interrupts
+- reg: Should contain the base address of the Global Timer registers
 - clocks: clock driving the timer hardware
 
 Optional properties:

trunk/Documentation/devicetree/bindings/arm/fsl.txt

@@ -5,14 +5,6 @@ i.MX23 Evaluation Kit
 Required root node properties:
     - compatible = "fsl,imx23-evk", "fsl,imx23";
 
-i.MX25 Product Development Kit
-Required root node properties:
-    - compatible = "fsl,imx25-pdk", "fsl,imx25";
-
-i.MX27 Product Development Kit
-Required root node properties:
-    - compatible = "fsl,imx27-pdk", "fsl,imx27";
-
 i.MX28 Evaluation Kit
 Required root node properties:
     - compatible = "fsl,imx28-evk", "fsl,imx28";

trunk/Documentation/devicetree/bindings/clock/imx5-clock.txt

@@ -171,7 +171,6 @@ clocks and IDs.
 	can_sel			156
 	can1_serial_gate	157
 	can1_ipg_gate		158
-	owire_gate		159
 
 Examples (for mx53):
 

trunk/Documentation/devicetree/bindings/clock/imx6q-clock.txt

@@ -203,8 +203,6 @@ clocks and IDs.
 	pcie_ref		188
 	pcie_ref_125m		189
 	enet_ref		190
-	usbphy1_gate		191
-	usbphy2_gate		192
 
 Examples:
 

trunk/Documentation/dma-buf-sharing.txt

@@ -302,11 +302,7 @@ Access to a dma_buf from the kernel context involves three steps:
       void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
 
    The vmap call can fail if there is no vmap support in the exporter, or if it
-   runs out of vmalloc space. Fallback to kmap should be implemented. Note that
-   the dma-buf layer keeps a reference count for all vmap access and calls down
-   into the exporter's vmap function only when no vmapping exists, and only
-   unmaps it once. Protection against concurrent vmap/vunmap calls is provided
-   by taking the dma_buf->lock mutex.
+   runs out of vmalloc space. Fallback to kmap should be implemented.
 
 3. Finish access
 

trunk/Documentation/kernel-parameters.txt

@@ -1645,6 +1645,42 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			that the amount of memory usable for all allocations
 			is not too small.
 
+	movablemem_map=acpi
+			[KNL,X86,IA-64,PPC] This parameter is similar to
+			memmap except it specifies the memory map of
+			ZONE_MOVABLE.
+			This option inform the kernel to use Hot Pluggable bit
+			in flags from SRAT from ACPI BIOS to determine which
+			memory devices could be hotplugged. The corresponding
+			memory ranges will be set as ZONE_MOVABLE.
+			NOTE: Whatever node the kernel resides in will always
+			      be un-hotpluggable.
+
+	movablemem_map=nn[KMG]@ss[KMG]
+			[KNL,X86,IA-64,PPC] This parameter is similar to
+			memmap except it specifies the memory map of
+			ZONE_MOVABLE.
+			If user specifies memory ranges, the info in SRAT will
+			be ingored. And it works like the following:
+			- If more ranges are all within one node, then from
+			  lowest ss to the end of the node will be ZONE_MOVABLE.
+			- If a range is within a node, then from ss to the end
+			  of the node will be ZONE_MOVABLE.
+			- If a range covers two or more nodes, then from ss to
+			  the end of the 1st node will be ZONE_MOVABLE, and all
+			  the rest nodes will only have ZONE_MOVABLE.
+			If memmap is specified at the same time, the
+			movablemem_map will be limited within the memmap
+			areas. If kernelcore or movablecore is also specified,
+			movablemem_map will have higher priority to be
+			satisfied. So the administrator should be careful that
+			the amount of movablemem_map areas are not too large.
+			Otherwise kernel won't have enough memory to start.
+			NOTE: We don't stop users specifying the node the
+			      kernel resides in as hotpluggable so that this
+			      option can be used as a workaround of firmware
+                              bugs.
+
 	MTD_Partition=	[MTD]
 			Format: <name>,<region-number>,<size>,<offset>
 

trunk/Documentation/scsi/ChangeLog.megaraid_sas

@@ -1,12 +1,3 @@
-Release Date    : Sat. Feb 9, 2013 17:00:00 PST 2013 -
-			(emaild-id:megaraidlinux@lsi.com)
-			Adam Radford
-Current Version : 06.506.00.00-rc1
-Old Version     : 06.504.01.00-rc1
-    1. Add 4k FastPath DIF support.
-    2. Dont load DevHandle unless FastPath enabled.
-    3. Version and Changelog update.
--------------------------------------------------------------------------------
 Release Date    : Mon. Oct 1, 2012 17:00:00 PST 2012 -
 			(emaild-id:megaraidlinux@lsi.com)
 			Adam Radford