]> git.baikalelectronics.ru Git - kernel.git/commit
virtio-net: realign page_to_skb() after merges
authorJakub Kicinski <kuba@kernel.org>
Mon, 2 Aug 2021 17:57:29 +0000 (10:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Aug 2021 11:46:26 +0000 (12:46 +0100)
commit05991058de683e2659d89ca7d08fcfd75d627fa2
tree420052f366d6d61f66777fb011abc00b749edee7
parent51c82e7e4040cb52fe527b83521b0e23028f1509
virtio-net: realign page_to_skb() after merges

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

commit 410e796d9f8c ("virtio_net: get build_skb() buf by data ptr")
commit ca0659e67c81 ("virtio-net: fix for unable to handle page fault for address")

into net, and

commit 11749eea60b8 ("virtio-net: get build_skb() buf by data ptr")
commit 1cb5f2beb733 ("virtio-net: fix for unable to handle page fault for address")

into net-next. Redo the merge from commit 9dd514bacd50 ("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>
drivers/net/virtio_net.c