linux-uconsole/drivers/virtio
Greg Kroah-Hartman 3f05c6dd13 ANDROID: fix up 5.10.132 merge with the virtio_mmio.c driver
The merge of 5.10.132 into the android12-5.10-lts branch caused
duplicate functions to be merged into the same file.  Fix this up by
removing the out-of-tree versions and accepting the versions that came
in as part of 5.10.132

Fixes: 0c724b692d ("Merge 5.10.132 into android12-5.10-lts")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3d4770e22d4e96b07e1e1d0f312f6fa4bb440e59
2022-07-30 17:39:01 +02:00
..
Kconfig
Makefile
virtio.c This is the 5.10.106 stable release 2022-03-18 15:02:31 +01:00
virtio_balloon.c
virtio_dma_buf.c
virtio_input.c
virtio_mem.c
virtio_mmio.c ANDROID: fix up 5.10.132 merge with the virtio_mmio.c driver 2022-07-30 17:39:01 +02:00
virtio_pci_common.c virtio-pci: Remove wrong address verification in vp_del_vqs() 2022-06-22 14:13:20 +02:00
virtio_pci_common.h
virtio_pci_legacy.c
virtio_pci_modern.c
virtio_ring.c This is the 5.10.94 stable release 2022-01-27 11:49:22 +01:00
virtio_vdpa.c virtio_vdpa: reject invalid vq indices 2021-09-03 10:09:27 +02:00