[PATCH 1/2] docs: power: Drop reference to interface.rst

[PATCH 1/2] docs: power: Drop reference to interface.rst

[Jonathan Neuschäfer]

It has been merged into sleep-states.rst.

Fixes: c21502efdaed ("Documentation: admin-guide: PM: Update sleep states documentation")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 Documentation/power/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/power/index.rst b/Documentation/power/index.rst
index 002e42745263..ced8a8007434 100644
--- a/Documentation/power/index.rst
+++ b/Documentation/power/index.rst
@@ -13,7 +13,6 @@ Power Management
     drivers-testing
     energy-model
     freezing-of-tasks
-    interface
     opp
     pci
     pm_qos_interface
--
2.20.1

[PATCH 2/2] docs: x86: Drop reference to intel_mpx.rst

[Jonathan Neuschäfer]

Intel MPX support and its documentation have been removed from the
kernel.

Fixes: 45fc24e89b7c ("x86/mpx: remove MPX from arch/x86")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 Documentation/x86/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst
index a8de2fbc1caa..265d9e9a093b 100644
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@ -19,7 +19,6 @@ x86-specific Documentation
    tlb
    mtrr
    pat
-   intel_mpx
    intel-iommu
    intel_txt
    amd-memory-encryption
--
2.20.1

Re: [PATCH 1/2] docs: power: Drop reference to interface.rst

[Rafael J. Wysocki]

On Tue, Feb 18, 2020 at 3:59 PM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:
>
> It has been merged into sleep-states.rst.
>
> Fixes: c21502efdaed ("Documentation: admin-guide: PM: Update sleep states documentation")
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> ---
>  Documentation/power/index.rst | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/Documentation/power/index.rst b/Documentation/power/index.rst
> index 002e42745263..ced8a8007434 100644
> --- a/Documentation/power/index.rst
> +++ b/Documentation/power/index.rst
> @@ -13,7 +13,6 @@ Power Management
>      drivers-testing
>      energy-model
>      freezing-of-tasks
> -    interface
>      opp
>      pci
>      pm_qos_interface
> --

Applied as a fix for 5.6, thanks!