We ended up merging two versions of the same patch set:

commit 8fb7da9e ("virtio_net: get build_skb() buf by data ptr")
commit 5c37711d ("virtio-net: fix for unable to handle page fault for address")

into net, and

commit 7bf64460 ("virtio-net: get build_skb() buf by data ptr")
commit 6c66c147 ("virtio-net: fix for unable to handle page fault for address")

into net-next. Redo the merge from commit 12628565 ("Merge
ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that
the most recent code remains.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>