Skip to content

Commit

Permalink
docs: x86: move two x86-specific files to x86 arch dir
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
mchehab committed Jul 15, 2019
1 parent 4d3beaa commit e8d776f
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Documentation/x86/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ x86-specific Documentation
mtrr
pat
intel_mpx
intel-iommu
intel_txt
amd-memory-encryption
pti
mds
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -8312,7 +8312,7 @@ L: [email protected]
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

Expand Down
2 changes: 1 addition & 1 deletion security/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ config INTEL_TXT
See <http://www.intel.com/technology/security/> for more information
about Intel(R) TXT.
See <http://tboot.sourceforge.net> 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.
Expand Down

0 comments on commit e8d776f

Please sign in to comment.