linux-next: manual merge of the target-updates tree with the rdma tree

[Stephen Rothwell]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in:

  drivers/infiniband/ulp/isert/ib_isert.c

between commit:

  4a061b287b1e ("IB/ulps: Avoid calling ib_query_device")

from the rdma tree and commit:

  373a4cd73782 ("iser-target: Fix non negative ERR_PTR isert_device_get usage")

from the target-updates tree.

I fixed it up (the former removed the code fixed up by the latter)
and can carry the fix as necessary (no action
is required).



-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/