On Tue, Nov 02, 2021 at 08:06:01AM +0100, Christoph Hellwig wrote:

The code in both files is deeply interconnected, so merge it and keep a bunch of structures and functions static.

Signed-off-by: Christoph Hellwig hch@lst.de

drivers/gpu/drm/i915/Makefile | 1 - drivers/gpu/drm/i915/gvt/gvt.c | 291 ------------------------------- drivers/gpu/drm/i915/gvt/gvt.h | 6 - drivers/gpu/drm/i915/gvt/kvmgt.c | 264 +++++++++++++++++++++++++++- 4 files changed, 260 insertions(+), 302 deletions(-) delete mode 100644 drivers/gpu/drm/i915/gvt/gvt.c

Reviewed-by: Jason Gunthorpe jgg@nvidia.com

Jason