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

ANDROID: GKI: Unhide VIRTIO_DMA_SHARED_BUFFER

2020-12-16 09:28:07 -08:00

Makefile

virtio: fix build for configs without dma-bufs

2020-08-19 06:43:28 +02:00

virtio_balloon.c

FROMGIT: mm, page_poison: remove CONFIG_PAGE_POISONING_NO_SANITY

2021-03-24 15:09:17 -07:00

virtio_dma_buf.c

ANDROID: virtio: disable virtio_dma_buf callback checks with CFI

2021-01-28 22:14:14 +00:00

virtio_input.c

Merge 1f70935f63 ("Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline

2020-10-27 11:47:16 +01:00

virtio_mem.c

ANDROID: mm: add cma allocation statistics

2021-07-14 11:54:48 -07:00

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

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 78

2019-05-24 17:37:51 +02:00

virtio_pci_legacy.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 78

2019-05-24 17:37:51 +02:00

virtio_pci_modern.c

virtio: Implement get_shm_region for PCI transport

2020-09-10 10:05:58 +02:00

virtio_ring.c

Merge 5.10.94 into android12-5.10-lts

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

virtio.c

Merge 5.10.106 into android12-5.10-lts

2022-03-18 15:02:31 +01:00