linux-next: manual merge of the virtio tree with Linus' tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
net/9p/trans_virtio.c between commit 8051a2a518fc ("9p/trans_virtio:
fix hot-unplug") from Linus' tree and commit 1991755689ad
("9p/trans_virtio: fix hot-unplug") from the virtio tree.

I fixed it up (the latter is an older version the former, which is now
in Linus' tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpQRCmMKD3zl.pgp
Description: OpenPGP digital signature