Hi David, Today's linux-next merge of the net tree got a conflict in drivers/net/virtio_net.c between commit 4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net support carrier detection") from the net-current tree and commit 9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status handling") from the net tree. I think that the latter patch means that the former is not needed, so I used the version from the net tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpUMt0QYliJh.pgp
Description: PGP signature