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

Commit 9806755c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'nfs-rdma' of git://git.linux-nfs.org/projects/anna/nfs-rdma into linux-next 

* 'nfs-rdma' of git://git.linux-nfs.org/projects/anna/nfs-rdma: (916 commits)
  xprtrdma: Handle additional connection events
  xprtrdma: Remove RPCRDMA_PERSISTENT_REGISTRATION macro
  xprtrdma: Make rpcrdma_ep_disconnect() return void
  xprtrdma: Schedule reply tasklet once per upcall
  xprtrdma: Allocate each struct rpcrdma_mw separately
  xprtrdma: Rename frmr_wr
  xprtrdma: Disable completions for LOCAL_INV Work Requests
  xprtrdma: Disable completions for FAST_REG_MR Work Requests
  xprtrdma: Don't post a LOCAL_INV in rpcrdma_register_frmr_external()
  xprtrdma: Reset FRMRs after a flushed LOCAL_INV Work Request
  xprtrdma: Reset FRMRs when FAST_REG_MR is flushed by a disconnect
  xprtrdma: Properly handle exhaustion of the rb_mws list
  xprtrdma: Chain together all MWs in same buffer pool
  xprtrdma: Back off rkey when FAST_REG_MR fails
  xprtrdma: Unclutter struct rpcrdma_mr_seg
  xprtrdma: Don't invalidate FRMRs if registration fails
  xprtrdma: On disconnect, don't ignore pending CQEs
  xprtrdma: Update rkeys after transport reconnect
  xprtrdma: Limit data payload size for ALLPHYSICAL
  xprtrdma: Protect ia->ri_id when unmapping/invalidating MRs
  ...
parents 3a505845 8079fb78

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
			Linus

----------



M: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator



N: Matti Aarnio

E: mea@nic.funet.fi

D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/Changes

+3 −6
Original line number Diff line number Diff line
@@ -280,12 +280,9 @@ that is possible. 
mcelog

------



In Linux 2.6.31+ the i386 kernel needs to run the mcelog utility

as a regular cronjob similar to the x86-64 kernel to process and log

machine check events when CONFIG_X86_NEW_MCE is enabled. Machine check

events are errors reported by the CPU. Processing them is strongly encouraged.

All x86-64 kernels since 2.6.4 require the mcelog utility to

process machine checks.

On x86 kernels the mcelog utility is needed to process and log machine check

events when CONFIG_X86_MCE is enabled. Machine check events are errors reported

by the CPU. Processing them is strongly encouraged.



Getting updated software

========================

Documentation/DocBook/gadget.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ hardware level details could be very different. 


<para>Systems need specialized hardware support to implement OTG,

notably including a special <emphasis>Mini-AB</emphasis> jack

and associated transciever to support <emphasis>Dual-Role</emphasis>

and associated transceiver to support <emphasis>Dual-Role</emphasis>

operation:

they can act either as a host, using the standard

Linux-USB host side driver stack,

Documentation/DocBook/genericirq.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
	<para>

	Each interrupt is described by an interrupt descriptor structure

	irq_desc. The interrupt is referenced by an 'unsigned int' numeric

	value which selects the corresponding interrupt decription structure

	value which selects the corresponding interrupt description structure

	in the descriptor structures array.

	The descriptor structure contains status information and pointers

	to the interrupt flow method and the interrupt chip structure
@@ -470,7 +470,7 @@ if (desc->irq_data.chip->irq_eoi) 
     <para>

       To avoid copies of identical implementations of IRQ chips the

       core provides a configurable generic interrupt chip

       implementation. Developers should check carefuly whether the

       implementation. Developers should check carefully whether the

       generic chip fits their needs before implementing the same

       functionality slightly differently themselves.

     </para>

Documentation/DocBook/kernel-locking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ as it would be on UP. 
</para>



<para>

There is a furthur optimization possible here: remember our original

There is a further optimization possible here: remember our original

cache code, where there were no reference counts and the caller simply

held the lock whenever using the object?  This is still possible: if

you hold the lock, no one can delete the object, so you don't need to