Commit 1425075e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-4.6-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma 



NFS: NFSoRDMA Client Side Changes

These patches include several bugfixes and cleanups for the NFSoRDMA client.
This includes bugfixes for NFS v4.1, proper RDMA_ERROR handling, and fixes
from the recent workqueue swicchover.  These patches also switch xprtrdma to
use the new CQ API

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>

* tag 'nfs-rdma-4.6-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma: (787 commits)
  xprtrdma: Use new CQ API for RPC-over-RDMA client send CQs
  xprtrdma: Use an anonymous union in struct rpcrdma_mw
  xprtrdma: Use new CQ API for RPC-over-RDMA client receive CQs
  xprtrdma: Serialize credit accounting again
  xprtrdma: Properly handle RDMA_ERROR replies
  rpcrdma: Add RPCRDMA_HDRLEN_ERR
  xprtrdma: Do not wait if ib_post_send() fails
  xprtrdma: Segment head and tail XDR buffers on page boundaries
  xprtrdma: Clean up dprintk format string containing a newline
  xprtrdma: Clean up physical_op_map()
  xprtrdma: Clean up unused RPCRDMA_INLINE_PAD_THRESH macro
parents 849dc324 2fa8f88d

Documentation/cgroup-v2.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and 
conventions of cgroup v2.  It describes all userland-visible aspects

conventions of cgroup v2.  It describes all userland-visible aspects

of cgroup including core and specific controller behaviors.  All

of cgroup including core and specific controller behaviors.  All

future changes must be reflected in this document.  Documentation for

future changes must be reflected in this document.  Documentation for

v1 is available under Documentation/cgroup-legacy/.

v1 is available under Documentation/cgroup-v1/.





CONTENTS

CONTENTS

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following 
clock-output-names:

clock-output-names:

 - "xin24m" - crystal input - required,

 - "xin24m" - crystal input - required,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_gmac" - external GMAC clock - optional

 - "rmii_clkin" - external EMAC clock - optional





Example: Clock controller node:

Example: Clock controller node:

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

+2 −3
Original line number Original line Diff line number Diff line
@@ -24,9 +24,8 @@ Main node required properties: 
		1 = edge triggered

		1 = edge triggered

		4 = level triggered

		4 = level triggered





  Cells 4 and beyond are reserved for future use. When the 1st cell

  Cells 4 and beyond are reserved for future use and must have a value

  has a value of 0 or 1, cells 4 and beyond act as padding, and may be

  of 0 if present.

  ignored. It is recommended that padding cells have a value of 0.





- reg : Specifies base physical address(s) and size of the GIC

- reg : Specifies base physical address(s) and size of the GIC

  registers, in the following order:

  registers, in the following order:

Documentation/devicetree/bindings/net/renesas,ravb.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -82,8 +82,8 @@ Example: 
				  "ch16", "ch17", "ch18", "ch19",

				  "ch16", "ch17", "ch18", "ch19",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch24";

				  "ch24";

		clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;

		clocks = <&cpg CPG_MOD 812>;

		power-domains = <&cpg_clocks>;

		power-domains = <&cpg>;

		phy-mode = "rgmii-id";

		phy-mode = "rgmii-id";

		phy-handle = <&phy0>;

		phy-handle = <&phy0>;

Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ OHCI and EHCI controllers. 
Required properties:

Required properties:

- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;

- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;

	      "renesas,pci-r8a7791" for the R8A7791 SoC;

	      "renesas,pci-r8a7791" for the R8A7791 SoC;

	      "renesas,pci-r8a7793" for the R8A7793 SoC;

	      "renesas,pci-r8a7794" for the R8A7794 SoC;

	      "renesas,pci-r8a7794" for the R8A7794 SoC;

	      "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device

	      "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device