linux-next: manual merge of the vhost tree with the net tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
drivers/net/virtio_net.c between commit 3bbf372c6c60 ("virtio-net: remove
useless disable on freeze") from the net tree and commit 53ffd226507a
("virtio-net: remove useless disable on freeze") from the vhost tree.

I just used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpcjpwQ8WgKE.pgp
Description: PGP signature