| Message ID | 20210911200504-mutt-send-email-mst@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,V2] virtio,vdpa,vhost: features, fixes | expand |
The pull request you sent on Sat, 11 Sep 2021 20:05:04 -0400:
> https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus_v2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a93a962669cdbe56bb0bcd88156f0f1598f31c88
Thank you!
On Sat, Sep 11, 2021 at 5:42 PM <pr-tracker-bot@kernel.org> wrote: > > The pull request you sent on Sat, 11 Sep 2021 20:05:04 -0400: > > > https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus_v2 > > has been merged into torvalds/linux.git: > https://git.kernel.org/torvalds/c/a93a962669cdbe56bb0bcd88156f0f1598f31c88 Note that pr-tracker-bot is confused, but not entirely wrong. Because this was a subset of the pull request that was actually merged, pr-tracker-bot reports that it was merged. True. But what was _really_ merged was the first version that contained this and then some. Linus
Changes from v1: dropped vdpa bits until we are sure how they are supposed to interact with recent upstream changes The following changes since commit 7d2a07b769330c34b4deabeed939325c77a7ec2f: Linux 5.14 (2021-08-29 15:04:50 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus_v2 for you to fetch changes up to 6105d1fe6f4c24ce8c13e2e6568b16b76e04983d: virtio-blk: remove unneeded "likely" statements (2021-09-06 07:20:56 -0400) ---------------------------------------------------------------- virtio,vdpa,vhost: features, fixes virtio-vsock support for end of record with SEQPACKET vdpa: mac and mq support for ifcvf and mlx5 vdpa: management netlink for ifcvf virtio-i2c, gpio dt bindings misc fixes, cleanups Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Arseny Krasnov (6): virtio/vsock: rename 'EOR' to 'EOM' bit. virtio/vsock: add 'VIRTIO_VSOCK_SEQ_EOR' bit. vhost/vsock: support MSG_EOR bit processing virtio/vsock: support MSG_EOR bit processing af_vsock: rename variables in receive loop vsock_test: update message bounds test for MSG_EOR Cai Huoqing (2): vhost scsi: Convert to SPDX identifier vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro Eli Cohen (6): vdpa/mlx5: Remove redundant header file inclusion vdpa/mlx5: function prototype modifications in preparation to control VQ vdpa/mlx5: Decouple virtqueue callback from struct mlx5_vdpa_virtqueue vdpa/mlx5: Ensure valid indices are provided vdpa/mlx5: Add support for control VQ and MAC setting vdpa/mlx5: Add multiqueue support Max Gurtovoy (1): virtio-blk: remove unneeded "likely" statements Viresh Kumar (5): dt-bindings: virtio: Add binding for virtio devices dt-bindings: i2c: Add bindings for i2c-virtio dt-bindings: gpio: Add bindings for gpio-virtio uapi: virtio_ids: Sync ids with specification virtio: Bind virtio device to device-tree node Xianting Tian (1): virtio-balloon: Use virtio_find_vqs() helper Xie Yongji (1): vdpa_sim: Use iova_shift() for the size passed to alloc_iova() Zhu Lingshan (4): vDPA/ifcvf: introduce get_dev_type() which returns virtio dev id vDPA/ifcvf: implement management netlink framework for ifcvf vDPA/ifcvf: detect and use the onboard number of queues directly vDPA/ifcvf: enable multiqueue and control vq .../devicetree/bindings/gpio/gpio-virtio.yaml | 59 +++ .../devicetree/bindings/i2c/i2c-virtio.yaml | 51 ++ Documentation/devicetree/bindings/virtio/mmio.yaml | 3 +- .../devicetree/bindings/virtio/virtio-device.yaml | 41 ++ drivers/block/virtio_blk.c | 4 +- drivers/vdpa/Kconfig | 1 + drivers/vdpa/ifcvf/ifcvf_base.c | 8 +- drivers/vdpa/ifcvf/ifcvf_base.h | 25 +- drivers/vdpa/ifcvf/ifcvf_main.c | 224 ++++++--- drivers/vdpa/mlx5/core/mlx5_vdpa.h | 26 +- drivers/vdpa/mlx5/core/mr.c | 81 +++- drivers/vdpa/mlx5/core/resources.c | 35 ++ drivers/vdpa/mlx5/net/mlx5_vnet.c | 517 ++++++++++++++++++--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- drivers/vhost/scsi.c | 14 +- drivers/vhost/vdpa.c | 24 +- drivers/vhost/vsock.c | 28 +- drivers/virtio/virtio.c | 57 ++- drivers/virtio/virtio_balloon.c | 4 +- include/uapi/linux/virtio_ids.h | 12 + include/uapi/linux/virtio_vsock.h | 3 +- net/vmw_vsock/af_vsock.c | 10 +- net/vmw_vsock/virtio_transport_common.c | 23 +- tools/testing/vsock/vsock_test.c | 8 +- 24 files changed, 1030 insertions(+), 231 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml create mode 100644 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml create mode 100644 Documentation/devicetree/bindings/virtio/virtio-device.yaml