[openib-general] svn updated from upstream

[Or Gerlitz]

Michael S. Tsirkin wrote:
> Quoting r. Or Gerlitz <or.gerlitz at gmail.com>:
>> Subject: Re: [PATCH] fmr pool: remove unnecessary pointer dereference
>>
>> On 7/13/06, Michael S. Tsirkin <mst at mellanox.co.il> wrote:
>>> Andrew, could you please drop the following into -mm and on to Linus?
> 
> OK, by popular demand :) I have put the following patches from upstream in svn:

Roland, Michael,

Do we have leftovers patches (eg the lockdep related once mentioned 
below) that were only sent upstream through Andrew to Linus and are not 
in the SVN? (they are also not in yours (Roland) git tree but you can 
pull them).

Till we decide something else, the SVN is a super set of the upstream 
code, correct?

Or.

> 
> r8530 | mst | 2006-07-16 17:05:12 +0300 (Sun, 16 Jul 2006) | 5 lines
> 
> Merge from upstream: remove an extra pointer deference from the fmr interface
> 
> Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>
> 
> 
> ------------------------------------------------------------------------
> r8529 | mst | 2006-07-16 17:01:20 +0300 (Sun, 16 Jul 2006) | 8 lines
> 
> mthca_ah_query returs the static rate of the address handle in internal mthc
> format. fix it to use rate encoding from enum ib_rate, which is what users
> expect.
> 
> Signed-off-by: Jack Morgenstein <jackm at mellanox.co.il>
> Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>
> 
> ------------------------------------------------------------------------
> r8528 | mst | 2006-07-16 17:00:10 +0300 (Sun, 16 Jul 2006) | 5 lines
> 
> IB/sa: merge from upstream: use gfp_mask specified by user for idr allocations
> 
> Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>
> 
> 
> ------------------------------------------------------------------------
> r8527 | mst | 2006-07-16 16:54:05 +0300 (Sun, 16 Jul 2006) | 12 lines
> 
> Already applied in 2.6.18.
> 
> [PATCH] srp: fix fmr error handling
> 
> srp_unmap_data assumes req->fmr is NULL if the request is not mapped,
> so we must clean it out in case of an error.
> 
> Signed-off-by: Vu Pham <vu at mellanox.com>
> Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>
> Acked-by: Roland Dreier <rolandd at cisco.com>
> 
> ------------------------------------------------------------------------
> 
> There were also lockdep-related fixes in mthca but I haven't the time to
> tackle them yet.
>