diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-02 20:57:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-03 14:46:26 +0300 |
| commit | c32325b8fdf2f979befb9fd5587918c0d5412db3 (patch) | |
| tree | 420052f366d6d61f66777fb011abc00b749edee7 /net/ethtool/ioctl.c | |
| parent | dc1a8079ebac2d7e79c78059a9abde8b1c9878eb (diff) | |
| download | linux-c32325b8fdf2f979befb9fd5587918c0d5412db3.tar.xz | |
virtio-net: realign page_to_skb() after merges
We ended up merging two versions of the same patch set:
commit 8fb7da9e9907 ("virtio_net: get build_skb() buf by data ptr")
commit 5c37711d9f27 ("virtio-net: fix for unable to handle page fault for address")
into net, and
commit 7bf64460e3b2 ("virtio-net: get build_skb() buf by data ptr")
commit 6c66c147b9a4 ("virtio-net: fix for unable to handle page fault for address")
into net-next. Redo the merge from commit 126285651b7f ("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>
Diffstat (limited to 'net/ethtool/ioctl.c')
0 files changed, 0 insertions, 0 deletions