2020-03-08 21:16:36

by J. Neuschäfer

Subject: [PATCH v2] docs: Move Intel Many Integrated Core documentation (mic) under misc-devices

It doesn't need to be a top-level chapter.

This patch also updates MAINTAINERS and makes sure the F: lines are
properly sorted.

Signed-off-by: Jonathan Neuschäfer <[email protected]>
---

v2:
- Run scripts/parse-maintainers.pl to sort the lines in the MAINTAINERS
entry, as suggested by Andy Shevchenko

v1:
- https://lore.kernel.org/lkml/[email protected]/
---
Documentation/index.rst | 1 -
Documentation/misc-devices/index.rst | 1 +
Documentation/{ => misc-devices}/mic/index.rst | 0
Documentation/{ => misc-devices}/mic/mic_overview.rst | 0
Documentation/{ => misc-devices}/mic/scif_overview.rst | 0
MAINTAINERS | 8 ++++----
6 files changed, 5 insertions(+), 5 deletions(-)
rename Documentation/{ => misc-devices}/mic/index.rst (100%)
rename Documentation/{ => misc-devices}/mic/mic_overview.rst (100%)
rename Documentation/{ => misc-devices}/mic/scif_overview.rst (100%)

diff --git a/Documentation/index.rst b/Documentation/index.rst
index e99d0bd2589d..6fdad61ee443 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -131,7 +131,6 @@ needed).
usb/index
PCI/index
misc-devices/index
- mic/index
scheduler/index

Architecture-agnostic documentation
diff --git a/Documentation/misc-devices/index.rst b/Documentation/misc-devices/index.rst
index f11c5daeada5..c1dcd2628911 100644
--- a/Documentation/misc-devices/index.rst
+++ b/Documentation/misc-devices/index.rst
@@ -20,4 +20,5 @@ fit into other categories.
isl29003
lis3lv02d
max6875
+ mic/index
xilinx_sdfec
diff --git a/Documentation/mic/index.rst b/Documentation/misc-devices/mic/index.rst
similarity index 100%
rename from Documentation/mic/index.rst
rename to Documentation/misc-devices/mic/index.rst
diff --git a/Documentation/mic/mic_overview.rst b/Documentation/misc-devices/mic/mic_overview.rst
similarity index 100%
rename from Documentation/mic/mic_overview.rst
rename to Documentation/misc-devices/mic/mic_overview.rst
diff --git a/Documentation/mic/scif_overview.rst b/Documentation/misc-devices/mic/scif_overview.rst
similarity index 100%
rename from Documentation/mic/scif_overview.rst
rename to Documentation/misc-devices/mic/scif_overview.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b229788d425..722b2e5d495b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8570,15 +8570,15 @@ M: Ashutosh Dixit <[email protected]>
S: Supported
W: https://github.com/sudeepdutt/mic
W: http://software.intel.com/en-us/mic-developer
+F: Documentation/misc-devices/mic/
+F: drivers/dma/mic_x100_dma.c
+F: drivers/dma/mic_x100_dma.h
+F: drivers/misc/mic/
F: include/linux/mic_bus.h
F: include/linux/scif.h
F: include/uapi/linux/mic_common.h
F: include/uapi/linux/mic_ioctl.h
F: include/uapi/linux/scif_ioctl.h
-F: drivers/misc/mic/
-F: drivers/dma/mic_x100_dma.c
-F: drivers/dma/mic_x100_dma.h
-F: Documentation/mic/

INTEL PMC CORE DRIVER
M: Rajneesh Bhardwaj <[email protected]>
--
2.20.1

2020-03-09 07:35:19

by Andy Shevchenko

Subject: Re: [PATCH v2] docs: Move Intel Many Integrated Core documentation (mic) under misc-devices

On Sun, Mar 8, 2020 at 11:17 PM Jonathan Neuschäfer
<[email protected]> wrote:
>
> It doesn't need to be a top-level chapter.
>
> This patch also updates MAINTAINERS and makes sure the F: lines are
> properly sorted.
>

Reviewed-by: Andy Shevchenko <[email protected]>
for MAINTAINERS change.

> Signed-off-by: Jonathan Neuschäfer <[email protected]>
> ---
>
> v2:
> - Run scripts/parse-maintainers.pl to sort the lines in the MAINTAINERS
> entry, as suggested by Andy Shevchenko
>
> v1:
> - https://lore.kernel.org/lkml/[email protected]/
> ---
> Documentation/index.rst | 1 -
> Documentation/misc-devices/index.rst | 1 +
> Documentation/{ => misc-devices}/mic/index.rst | 0
> Documentation/{ => misc-devices}/mic/mic_overview.rst | 0
> Documentation/{ => misc-devices}/mic/scif_overview.rst | 0
> MAINTAINERS | 8 ++++----
> 6 files changed, 5 insertions(+), 5 deletions(-)
> rename Documentation/{ => misc-devices}/mic/index.rst (100%)
> rename Documentation/{ => misc-devices}/mic/mic_overview.rst (100%)
> rename Documentation/{ => misc-devices}/mic/scif_overview.rst (100%)
>
> diff --git a/Documentation/index.rst b/Documentation/index.rst
> index e99d0bd2589d..6fdad61ee443 100644
> --- a/Documentation/index.rst
> +++ b/Documentation/index.rst
> @@ -131,7 +131,6 @@ needed).
> usb/index
> PCI/index
> misc-devices/index
> - mic/index
> scheduler/index
>
> Architecture-agnostic documentation
> diff --git a/Documentation/misc-devices/index.rst b/Documentation/misc-devices/index.rst
> index f11c5daeada5..c1dcd2628911 100644
> --- a/Documentation/misc-devices/index.rst
> +++ b/Documentation/misc-devices/index.rst
> @@ -20,4 +20,5 @@ fit into other categories.
> isl29003
> lis3lv02d
> max6875
> + mic/index
> xilinx_sdfec
> diff --git a/Documentation/mic/index.rst b/Documentation/misc-devices/mic/index.rst
> similarity index 100%
> rename from Documentation/mic/index.rst
> rename to Documentation/misc-devices/mic/index.rst
> diff --git a/Documentation/mic/mic_overview.rst b/Documentation/misc-devices/mic/mic_overview.rst
> similarity index 100%
> rename from Documentation/mic/mic_overview.rst
> rename to Documentation/misc-devices/mic/mic_overview.rst
> diff --git a/Documentation/mic/scif_overview.rst b/Documentation/misc-devices/mic/scif_overview.rst
> similarity index 100%
> rename from Documentation/mic/scif_overview.rst
> rename to Documentation/misc-devices/mic/scif_overview.rst
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5b229788d425..722b2e5d495b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -8570,15 +8570,15 @@ M: Ashutosh Dixit <[email protected]>
> S: Supported
> W: https://github.com/sudeepdutt/mic
> W: http://software.intel.com/en-us/mic-developer
> +F: Documentation/misc-devices/mic/
> +F: drivers/dma/mic_x100_dma.c
> +F: drivers/dma/mic_x100_dma.h
> +F: drivers/misc/mic/
> F: include/linux/mic_bus.h
> F: include/linux/scif.h
> F: include/uapi/linux/mic_common.h
> F: include/uapi/linux/mic_ioctl.h
> F: include/uapi/linux/scif_ioctl.h
> -F: drivers/misc/mic/
> -F: drivers/dma/mic_x100_dma.c
> -F: drivers/dma/mic_x100_dma.h
> -F: Documentation/mic/
>
> INTEL PMC CORE DRIVER
> M: Rajneesh Bhardwaj <[email protected]>
> --
> 2.20.1
>


--
With Best Regards,
Andy Shevchenko

2020-03-10 17:13:55

by Jonathan Corbet

Subject: Re: [PATCH v2] docs: Move Intel Many Integrated Core documentation (mic) under misc-devices

On Mon, 9 Mar 2020 09:34:37 +0200
Andy Shevchenko <[email protected]> wrote:

> On Sun, Mar 8, 2020 at 11:17 PM Jonathan Neuschäfer
> <[email protected]> wrote:
> >
> > It doesn't need to be a top-level chapter.
> >
> > This patch also updates MAINTAINERS and makes sure the F: lines are
> > properly sorted.
> >
>
> Reviewed-by: Andy Shevchenko <[email protected]>
> for MAINTAINERS change.
>
> > Signed-off-by: Jonathan Neuschäfer <[email protected]>

Applied, thanks.

jon