Skip to content

Commit 2ef32ad

Browse files
torvaldstorvalds
committed
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin: "Several new features here: - virtio-net is finally supported in vduse - virtio (balloon and mem) interaction with suspend is improved - vhost-scsi now handles signals better/faster And fixes, cleanups all over the place" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (48 commits) virtio-pci: Check if is_avq is NULL virtio: delete vq in vp_find_vqs_msix() when request_irq() fails MAINTAINERS: add Eugenio Pérez as reviewer vhost-vdpa: Remove usage of the deprecated ida_simple_xx() API vp_vdpa: don't allocate unused msix vectors sound: virtio: drop owner assignment fuse: virtio: drop owner assignment scsi: virtio: drop owner assignment rpmsg: virtio: drop owner assignment nvdimm: virtio_pmem: drop owner assignment wifi: mac80211_hwsim: drop owner assignment vsock/virtio: drop owner assignment net: 9p: virtio: drop owner assignment net: virtio: drop owner assignment net: caif: virtio: drop owner assignment misc: nsm: drop owner assignment iommu: virtio: drop owner assignment drm/virtio: drop owner assignment gpio: virtio: drop owner assignment firmware: arm_scmi: virtio: drop owner assignment ...
2 parents c760b37 + c8fae27 commit 2ef32ad

File tree

40 files changed

+353
-175
lines changed

40 files changed

+353
-175
lines changed

‎MAINTAINERS

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10654,8 +10654,10 @@ F: include/net/nl802154.h
1065410654
F: net/ieee802154/
1065510655
F: net/mac802154/
1065610656

10657-
IFCVF VIRTIO DATA PATH ACCELERATOR
10658-
R: Zhu Lingshan <[email protected]>
10657+
Intel VIRTIO DATA PATH ACCELERATOR
10658+
M: Zhu Lingshan <[email protected]>
10659+
L: [email protected]
10660+
S: Supported
1065910661
F: drivers/vdpa/ifcvf/
1066010662

1066110663
IFE PROTOCOL
@@ -23746,6 +23748,7 @@ M: "Michael S. Tsirkin" <[email protected]>
2374623748
M: Jason Wang <[email protected]>
2374723749
R: Paolo Bonzini <[email protected]>
2374823750
R: Stefan Hajnoczi <[email protected]>
23751+
R: Eugenio Pérez <[email protected]>
2374923752
L: [email protected]
2375023753
S: Maintained
2375123754
F: drivers/block/virtio_blk.c
@@ -23764,6 +23767,7 @@ VIRTIO CORE AND NET DRIVERS
2376423767
M: "Michael S. Tsirkin" <[email protected]>
2376523768
M: Jason Wang <[email protected]>
2376623769
R: Xuan Zhuo <[email protected]>
23770+
R: Eugenio Pérez <[email protected]>
2376723771
L: [email protected]
2376823772
S: Maintained
2376923773
F: Documentation/ABI/testing/sysfs-bus-vdpa
@@ -23805,6 +23809,7 @@ VIRTIO FILE SYSTEM
2380523809
M: Vivek Goyal <[email protected]>
2380623810
M: Stefan Hajnoczi <[email protected]>
2380723811
M: Miklos Szeredi <[email protected]>
23812+
R: Eugenio Pérez <[email protected]>
2380823813
L: [email protected]
2380923814
L: [email protected]
2381023815
S: Supported
@@ -23838,6 +23843,7 @@ F: include/uapi/linux/virtio_gpu.h
2383823843
VIRTIO HOST (VHOST)
2383923844
M: "Michael S. Tsirkin" <[email protected]>
2384023845
M: Jason Wang <[email protected]>
23846+
R: Eugenio Pérez <[email protected]>
2384123847
L: [email protected]
2384223848
L: [email protected]
2384323849
L: [email protected]

‎arch/um/drivers/virt-pci.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,6 @@ MODULE_DEVICE_TABLE(virtio, id_table);
752752

753753
static struct virtio_driver um_pci_virtio_driver = {
754754
.driver.name = "virtio-pci",
755-
.driver.owner = THIS_MODULE,
756755
.id_table = id_table,
757756
.probe = um_pci_virtio_probe,
758757
.remove = um_pci_virtio_remove,

‎drivers/block/virtio_blk.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,6 @@ static struct virtio_driver virtio_blk = {
16581658
.feature_table_legacy = features_legacy,
16591659
.feature_table_size_legacy = ARRAY_SIZE(features_legacy),
16601660
.driver.name = KBUILD_MODNAME,
1661-
.driver.owner = THIS_MODULE,
16621661
.id_table = id_table,
16631662
.probe = virtblk_probe,
16641663
.remove = virtblk_remove,

‎drivers/bluetooth/virtio_bt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ static const unsigned int virtbt_features[] = {
415415

416416
static struct virtio_driver virtbt_driver = {
417417
.driver.name = KBUILD_MODNAME,
418-
.driver.owner = THIS_MODULE,
419418
.feature_table = virtbt_features,
420419
.feature_table_size = ARRAY_SIZE(virtbt_features),
421420
.id_table = virtbt_table,

‎drivers/char/hw_random/virtio-rng.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ static const struct virtio_device_id id_table[] = {
245245

246246
static struct virtio_driver virtio_rng_driver = {
247247
.driver.name = KBUILD_MODNAME,
248-
.driver.owner = THIS_MODULE,
249248
.id_table = id_table,
250249
.probe = virtrng_probe,
251250
.remove = virtrng_remove,

‎drivers/char/virtio_console.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,6 @@ static struct virtio_driver virtio_console = {
21732173
.feature_table = features,
21742174
.feature_table_size = ARRAY_SIZE(features),
21752175
.driver.name = KBUILD_MODNAME,
2176-
.driver.owner = THIS_MODULE,
21772176
.id_table = id_table,
21782177
.probe = virtcons_probe,
21792178
.remove = virtcons_remove,
@@ -2188,7 +2187,6 @@ static struct virtio_driver virtio_rproc_serial = {
21882187
.feature_table = rproc_serial_features,
21892188
.feature_table_size = ARRAY_SIZE(rproc_serial_features),
21902189
.driver.name = "virtio_rproc_serial",
2191-
.driver.owner = THIS_MODULE,
21922190
.id_table = rproc_serial_id_table,
21932191
.probe = virtcons_probe,
21942192
.remove = virtcons_remove,

‎drivers/crypto/virtio/virtio_crypto_core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,6 @@ static const struct virtio_device_id id_table[] = {
581581

582582
static struct virtio_driver virtio_crypto_driver = {
583583
.driver.name = KBUILD_MODNAME,
584-
.driver.owner = THIS_MODULE,
585584
.feature_table = features,
586585
.feature_table_size = ARRAY_SIZE(features),
587586
.id_table = id_table,

‎drivers/firmware/arm_scmi/virtio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,6 @@ static const struct virtio_device_id id_table[] = {
908908

909909
static struct virtio_driver virtio_scmi_driver = {
910910
.driver.name = "scmi-virtio",
911-
.driver.owner = THIS_MODULE,
912911
.feature_table = features,
913912
.feature_table_size = ARRAY_SIZE(features),
914913
.id_table = id_table,

‎drivers/gpio/gpio-virtio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,6 @@ static struct virtio_driver virtio_gpio_driver = {
653653
.remove = virtio_gpio_remove,
654654
.driver = {
655655
.name = KBUILD_MODNAME,
656-
.owner = THIS_MODULE,
657656
},
658657
};
659658
module_virtio_driver(virtio_gpio_driver);

‎drivers/gpu/drm/virtio/virtgpu_drv.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ static struct virtio_driver virtio_gpu_driver = {
154154
.feature_table = features,
155155
.feature_table_size = ARRAY_SIZE(features),
156156
.driver.name = KBUILD_MODNAME,
157-
.driver.owner = THIS_MODULE,
158157
.id_table = id_table,
159158
.probe = virtio_gpu_probe,
160159
.remove = virtio_gpu_remove,

0 commit comments

Comments
 (0)