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

[Stephen Rothwell]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/xen/xen-scsiback.c between commit 785748788baf ("xen-scsiback:
define a pr_fmt macro with xen-pvscsi") from the xen-tip tree and
commit b4dd93cb4409 ("target: simplify the target template registration
API") from the target-updates tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp1shzXK9Xsr.pgp
Description: OpenPGP digital signature