[git pull] iommu: Move Intel and AMD drivers to a subdirectory

* [git pull] iommu: Move Intel and AMD drivers to a subdirectory
@ 2020-06-12 15:22 Joerg Roedel
  2020-06-12 19:23 ` Linus Torvalds
  2020-06-12 19:25 ` pr-tracker-bot
  0 siblings, 2 replies; 4+ messages in thread
From: Joerg Roedel @ 2020-06-12 15:22 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: iommu, linux-kernel

[-- Attachment #1.1: Type: text/plain, Size: 3639 bytes --]

Hi Linus,

I am not sure it is the right time to send this. The patches below have
not been part of the IOMMU updates for v5.8, in the AMD case because it
made the merge conflicts even worse, and in the Intel case because it
was not done yet.

It would be good to have both drivers moved in v5.8-rc1, mostly because
it avoids conflicts between fixes and v5.9 updates later in the cycle.
But it is also no problem to defer these changes, I can put them again
into the IOMMU tree and the end of the v5.8 cycle when you feel this
should have been ready earlier. With that said:

The following changes since commit 431275afdc7155415254aef4bd3816a1b8a2ead0:

  iommu: Check for deferred attach in iommu_group_do_dma_attach() (2020-06-04 11:38:17 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-drivers-move-v5.8

for you to fetch changes up to 672cf6df9b8a3a6d70a6a5c30397f76fa40d3178:

  iommu/vt-d: Move Intel IOMMU driver into subdirectory (2020-06-10 17:46:43 +0200)

----------------------------------------------------------------
IOMMU drivers directory structure cleanup:

	- Move the Intel and AMD IOMMU drivers into their own
	  subdirectory. Both drivers consist of several files by now and
	  giving them their own directory unclutters the IOMMU top-level
	  directory a bit.

----------------------------------------------------------------
Joerg Roedel (2):
      iommu/amd: Move AMD IOMMU driver into subdirectory
      iommu/vt-d: Move Intel IOMMU driver into subdirectory

 MAINTAINERS                                            |  5 ++---
 drivers/iommu/Makefile                                 | 18 +++++++++---------
 drivers/iommu/{ => amd}/amd_iommu.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
 .../iommu/{intel-iommu-debugfs.c => intel/debugfs.c}   |  0
 drivers/iommu/{ => intel}/dmar.c                       |  2 +-
 drivers/iommu/{ => intel}/intel-pasid.h                |  0
 drivers/iommu/{intel-iommu.c => intel/iommu.c}         |  2 +-
 .../{intel_irq_remapping.c => intel/irq_remapping.c}   |  2 +-
 drivers/iommu/{intel-pasid.c => intel/pasid.c}         |  0
 drivers/iommu/{intel-svm.c => intel/svm.c}             |  0
 drivers/iommu/{intel-trace.c => intel/trace.c}         |  0
 17 files changed, 16 insertions(+), 17 deletions(-)
 rename drivers/iommu/{ => amd}/amd_iommu.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%)
 rename drivers/iommu/{intel-iommu-debugfs.c => intel/debugfs.c} (100%)
 rename drivers/iommu/{ => intel}/dmar.c (99%)
 rename drivers/iommu/{ => intel}/intel-pasid.h (100%)
 rename drivers/iommu/{intel-iommu.c => intel/iommu.c} (99%)
 rename drivers/iommu/{intel_irq_remapping.c => intel/irq_remapping.c} (99%)
 rename drivers/iommu/{intel-pasid.c => intel/pasid.c} (100%)
 rename drivers/iommu/{intel-svm.c => intel/svm.c} (100%)
 rename drivers/iommu/{intel-trace.c => intel/trace.c} (100%)

Please pull.

Thanks,

	Joerg

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 156 bytes --]

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

^ permalink raw reply	[flat|nested] 4+ messages in thread