Commit 3438995b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-for-4.2' of git://git.linux-nfs.org/projects/anna/nfs-rdma 



NFS: NFSoRDMA Client Changes

These patches continue to build up for improving the rsize and wsize that the
NFS client uses when talking over RDMA.  In addition, these patches also add
in scalability enhancements and other bugfixes.

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

* tag 'nfs-rdma-for-4.2' of git://git.linux-nfs.org/projects/anna/nfs-rdma: (142 commits)
  xprtrdma: Reduce per-transport MR allocation
  xprtrdma: Stack relief in fmr_op_map()
  xprtrdma: Split rb_lock
  xprtrdma: Remove rpcrdma_ia::ri_memreg_strategy
  xprtrdma: Remove ->ro_reset
  xprtrdma: Remove unused LOCAL_INV recovery logic
  xprtrdma: Acquire MRs in rpcrdma_register_external()
  xprtrdma: Introduce an FRMR recovery workqueue
  xprtrdma: Acquire FMRs in rpcrdma_fmr_register_external()
  xprtrdma: Introduce helpers for allocating MWs
  xprtrdma: Use ib_device pointer safely
  xprtrdma: Remove rr_func
  xprtrdma: Replace rpcrdma_rep::rr_buffer with rr_rxprt
  xprtrdma: Warn when there are orphaned IB objects
  ...
parents 5ba12443 40c6ed0c

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+2 −4
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ Optional properties: 
  - phys: phandle + phy specifier pair

  - phy-names: must be "usb"

  - dmas: Must contain a list of references to DMA specifiers.

  - dma-names : Must contain a list of DMA names:

   - tx0 ... tx<n>

   - rx0 ... rx<n>

    - This <n> means DnFIFO in USBHS module.

  - dma-names : named "ch%d", where %d is the channel number ranging from zero

                to the number of channels (DnFIFOs) minus one.



Example:

	usbhs: usb@e6590000 {

MAINTAINERS

+7 −6
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ trivial patch so apply some common sense. 
	or does something very odd once a month document it.



	PLEASE remember that submissions must be made under the terms

	of the OSDL certificate of contribution and should include a

	Signed-off-by: line.  The current version of this "Developer's

	Certificate of Origin" (DCO) is listed in the file

	of the Linux Foundation certificate of contribution and should

	include a Signed-off-by: line.  The current version of this

	"Developer's Certificate of Origin" (DCO) is listed in the file

	Documentation/SubmittingPatches.



6.	Make sure you have the right to send any changes you make. If you
@@ -7575,6 +7575,7 @@ F: drivers/pci/host/pci-exynos.c 


PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*designware*
@@ -7588,8 +7589,9 @@ F: Documentation/devicetree/bindings/pci/host-generic-pci.txt 
F:	drivers/pci/host/pci-host-generic.c



PCIE DRIVER FOR ST SPEAR13XX

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Orphan

S:	Maintained

F:	drivers/pci/host/*spear*



PCMCIA SUBSYSTEM
@@ -10587,8 +10589,7 @@ F: drivers/virtio/virtio_input.c 
F:	include/uapi/linux/virtio_input.h



VIA RHINE NETWORK DRIVER

M:	Roger Luethi <rl@hellgate.ch>

S:	Maintained

S:	Orphan

F:	drivers/net/ethernet/via/via-rhine.c



VIA SD/MMC CARD CONTROLLER DRIVER

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/ia64/kernel/smpboot.c

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int smp_num_siblings = 1; 
volatile int ia64_cpu_to_sapicid[NR_CPUS];

EXPORT_SYMBOL(ia64_cpu_to_sapicid);



static volatile cpumask_t cpu_callin_map;

static cpumask_t cpu_callin_map;



struct smp_boot_data smp_boot_data __initdata;
@@ -477,6 +477,7 @@ do_boot_cpu (int sapicid, int cpu, struct task_struct *idle) 
	for (timeout = 0; timeout < 100000; timeout++) {

		if (cpumask_test_cpu(cpu, &cpu_callin_map))

			break;  /* It has booted */

		barrier(); /* Make sure we re-read cpu_callin_map */

		udelay(100);

	}

	Dprintk("\n");

arch/mips/ath79/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ void __init plat_time_init(void) 
	ddr_clk_rate = ath79_get_sys_clk_rate("ddr");

	ref_clk_rate = ath79_get_sys_clk_rate("ref");



	pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz",

	pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz\n",

		cpu_clk_rate / 1000000, (cpu_clk_rate / 1000) % 1000,

		ddr_clk_rate / 1000000, (ddr_clk_rate / 1000) % 1000,

		ahb_clk_rate / 1000000, (ahb_clk_rate / 1000) % 1000,

CRA Git | Maintained and supported by SUSTech CRA and CCSE