Patch "virtio_net: don't require ANY_LAYOUT with VERSION_1" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

virtio_net: don't require ANY_LAYOUT with VERSION_1

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
virtio_net-don-t-require-any_layout-with-version_1.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: "Michael S. Tsirkin" <[email protected]>
Date: Wed, 15 Jul 2015 15:26:19 +0300
Subject: virtio_net: don't require ANY_LAYOUT with VERSION_1

From: "Michael S. Tsirkin" <[email protected]>

[ Upstream commit 75993300d008f418ee2569a632185fc1d7d50674 ]

ANY_LAYOUT is a compatibility feature. It's implied for VERSION_1 devices, and non-transitional devices might not offer it. Change code to behave accordingly.

---
 drivers/net/virtio_net.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -1828,7 +1828,8 @@ static int virtnet_probe(struct virtio_d
 	else
 		vi->hdr_len = sizeof(struct virtio_net_hdr);
 
-	if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT))
+	if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT) ||
+	    virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
 		vi->any_header_sg = true;
 
 	if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ))

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/virtio_net-don-t-require-any_layout-with-version_1.patch