On Wed, May 27, 2020 at 01:53:04PM +0200, Joerg Roedel wrote: > From: Joerg Roedel <jroe...@suse.de> > > The driver consists of five C files and three header files by now. > Move them to their own subdirectory to not clutter to iommu top-level > directory with them. > > Signed-off-by: Joerg Roedel <jroe...@suse.de> > --- > MAINTAINERS | 2 +- > drivers/iommu/Makefile | 6 +++--- > drivers/iommu/{ => amd}/amd_iommu.h | 0 > drivers/iommu/{ => amd}/amd_iommu_proto.h | 0 > drivers/iommu/{ => amd}/amd_iommu_types.h | 0 > drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} | 0 > drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +- > drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +- > drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0 > drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0 > 10 files changed, 6 insertions(+), 6 deletions(-) > rename drivers/iommu/{ => amd}/amd_iommu.h (100%) > rename drivers/iommu/{ => amd}/amd_iommu_proto.h (100%) > rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%) > rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (100%) > rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%) > rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (99%) > rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (100%) > rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%)
Okay, so there were a lot of conflicts creating my next branch after this patch-set was applied, so I skipped this patch to make resolving them a bit easier. I will send out this patch again separatly together with a patch doing the same for VT-d and merge it directly into the next branch I will send to Linus. Joerg