[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the vhost tree with the net tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2012-05-31 3:13:19
Message-ID: 20120531131319.a1a7f5a47fd5db7c85cebc0e () canb ! auug ! org ! au
[Download RAW message or body]

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.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]