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

[Stephen Rothwell]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/infiniband/ulp/srpt/ib_srpt.c between commit 9f5d32af09b9
("ib_srpt: convert printk's to pr_* functions") from the infiniband
tree and commit 9ac8928e6a3e ("target: simplify the target template
registration API") from the target-updates tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpw3uavVr_js.pgp
Description: OpenPGP digital signature