]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 03:00:58 +0000 (13:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 03:00:58 +0000 (13:00 +1000)
commit7200ee8bacd7832b424d1f7143ae0295323daecf
treecc5559b76e723c25b99a8e4801dc85467f443881
parent5fa148f4e0b7fa60fc89d743e6a96ccf570fb4b4
parent4a3a6d9fb65f72b970265d6aa0d7fa792eb79b71
Merge remote-tracking branch 'vhost/linux-next'

# Conflicts:
# drivers/virtio/virtio.c
# include/uapi/linux/virtio_ids.h
drivers/vdpa/mlx5/net/mlx5_vnet.c
drivers/virtio/virtio.c