From e8d776f20f92b9c679bcdcbdf3aee5026d5265f5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 20 Apr 2019 09:20:52 -0300 Subject: [PATCH] docs: x86: move two x86-specific files to x86 arch dir Those two docs belong to the x86 architecture: Documentation/Intel-IOMMU.txt -> Documentation/x86/intel-iommu.rst Documentation/intel_txt.txt -> Documentation/x86/intel_txt.rst Signed-off-by: Mauro Carvalho Chehab --- Documentation/x86/index.rst | 2 ++ Documentation/{Intel-IOMMU.txt => x86/intel-iommu.rst} | 0 Documentation/{intel_txt.txt => x86/intel_txt.rst} | 0 MAINTAINERS | 2 +- security/Kconfig | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) rename Documentation/{Intel-IOMMU.txt => x86/intel-iommu.rst} (100%) rename Documentation/{intel_txt.txt => x86/intel_txt.rst} (100%) diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index f2de1b2d3ac7..af64c4bb4447 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst @@ -20,6 +20,8 @@ x86-specific Documentation mtrr pat intel_mpx + intel-iommu + intel_txt amd-memory-encryption pti mds diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/x86/intel-iommu.rst similarity index 100% rename from Documentation/Intel-IOMMU.txt rename to Documentation/x86/intel-iommu.rst diff --git a/Documentation/intel_txt.txt b/Documentation/x86/intel_txt.rst similarity index 100% rename from Documentation/intel_txt.txt rename to Documentation/x86/intel_txt.rst diff --git a/MAINTAINERS b/MAINTAINERS index 699596d931c1..f33487dabafd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8312,7 +8312,7 @@ L: tboot-devel@lists.sourceforge.net W: http://tboot.sourceforge.net T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot S: Supported -F: Documentation/intel_txt.txt +F: Documentation/x86/intel_txt.rst F: include/linux/tboot.h F: arch/x86/kernel/tboot.c diff --git a/security/Kconfig b/security/Kconfig index 06a30851511a..0d65594b5196 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -121,7 +121,7 @@ config INTEL_TXT See for more information about Intel(R) TXT. See for more information about tboot. - See Documentation/intel_txt.txt for a description of how to enable + See Documentation/x86/intel_txt.rst for a description of how to enable Intel TXT support in a kernel boot. If you are unsure as to whether this is required, answer N.