| Message ID | 1ecff14ec37c0c434f003d93c4b86b1cd3dac834.1561724493.git.mchehab+samsung@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Fri, Jun 28, 2019 at 2:30 PM Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote: > While this is stated as obsoleted, the sysfs interface described > there is still valid, and belongs to the admin-guide. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> This doesn't apply to my tree because of dependencies in the index so I guess it's best if you merge it: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Em Wed, 3 Jul 2019 10:44:38 +0200 Linus Walleij <linus.walleij@linaro.org> escreveu: > On Fri, Jun 28, 2019 at 2:30 PM Mauro Carvalho Chehab > <mchehab+samsung@kernel.org> wrote: > > > While this is stated as obsoleted, the sysfs interface described > > there is still valid, and belongs to the admin-guide. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > This doesn't apply to my tree because of dependencies in the > index Yeah, this /39 patch series heavily touch the index files. Better to merge them altogether. > so I guess it's best if you merge it: > Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks! Mauro > > Yours, > Linus Walleij Thanks, Mauro
diff --git a/Documentation/ABI/obsolete/sysfs-gpio b/Documentation/ABI/obsolete/sysfs-gpio index 40d41ea1a3f5..e0d4e5e2dd90 100644 --- a/Documentation/ABI/obsolete/sysfs-gpio +++ b/Documentation/ABI/obsolete/sysfs-gpio @@ -11,7 +11,7 @@ Description: Kernel code may export it for complete or partial access. GPIOs are identified as they are inside the kernel, using integers in - the range 0..INT_MAX. See Documentation/gpio for more information. + the range 0..INT_MAX. See Documentation/admin-guide/gpio for more information. /sys/class/gpio /export ... asks the kernel to export a GPIO to userspace diff --git a/Documentation/gpio/index.rst b/Documentation/admin-guide/gpio/index.rst similarity index 78% rename from Documentation/gpio/index.rst rename to Documentation/admin-guide/gpio/index.rst index 09a4a553f434..a244ba4e87d5 100644 --- a/Documentation/gpio/index.rst +++ b/Documentation/admin-guide/gpio/index.rst @@ -1,4 +1,4 @@ -:orphan: +.. SPDX-License-Identifier: GPL-2.0 ==== gpio diff --git a/Documentation/gpio/sysfs.rst b/Documentation/admin-guide/gpio/sysfs.rst similarity index 100% rename from Documentation/gpio/sysfs.rst rename to Documentation/admin-guide/gpio/sysfs.rst diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 2c20607e90cd..367097abec78 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -90,6 +90,7 @@ configure specific aspects of kernel behavior to your liking. cputopology device-mapper/index efi-stub + gpio/index highuid hw_random iostats diff --git a/Documentation/firmware-guide/acpi/enumeration.rst b/Documentation/firmware-guide/acpi/enumeration.rst index 1252617b520f..0a72b6321f5f 100644 --- a/Documentation/firmware-guide/acpi/enumeration.rst +++ b/Documentation/firmware-guide/acpi/enumeration.rst @@ -316,7 +316,7 @@ specifies the path to the controller. In order to use these GPIOs in Linux we need to translate them to the corresponding Linux GPIO descriptors. There is a standard GPIO API for that and is documented in -Documentation/gpio/. +Documentation/admin-guide/gpio/. In the above example we can get the corresponding two GPIO descriptors with a code like this:: diff --git a/Documentation/translations/zh_CN/gpio.txt b/Documentation/translations/zh_CN/gpio.txt index 4cb1ba8b8fed..a23ee14fc927 100644 --- a/Documentation/translations/zh_CN/gpio.txt +++ b/Documentation/translations/zh_CN/gpio.txt @@ -1,4 +1,4 @@ -Chinese translated version of Documentation/gpio +Chinese translated version of Documentation/admin-guide/gpio If you have any comment or update to the content, please contact the original document maintainer directly. However, if you have a problem @@ -10,7 +10,7 @@ Maintainer: Grant Likely <grant.likely@secretlab.ca> Linus Walleij <linus.walleij@linaro.org> Chinese maintainer: Fu Wei <tekkamanninja@gmail.com> --------------------------------------------------------------------- -Documentation/gpio 的中文翻译 +Documentation/admin-guide/gpio 的中文翻译 如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文 交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻 diff --git a/MAINTAINERS b/MAINTAINERS index cda68bbd9d1c..a49698b3becd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6812,7 +6812,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git S: Maintained F: Documentation/devicetree/bindings/gpio/ F: Documentation/driver-api/gpio/ -F: Documentation/gpio/ +F: Documentation/admin-guide/gpio/ F: Documentation/ABI/testing/gpio-cdev F: Documentation/ABI/obsolete/sysfs-gpio F: drivers/gpio/
While this is stated as obsoleted, the sysfs interface described there is still valid, and belongs to the admin-guide. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> --- Documentation/ABI/obsolete/sysfs-gpio | 2 +- Documentation/{ => admin-guide}/gpio/index.rst | 2 +- Documentation/{ => admin-guide}/gpio/sysfs.rst | 0 Documentation/admin-guide/index.rst | 1 + Documentation/firmware-guide/acpi/enumeration.rst | 2 +- Documentation/translations/zh_CN/gpio.txt | 4 ++-- MAINTAINERS | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename Documentation/{ => admin-guide}/gpio/index.rst (78%) rename Documentation/{ => admin-guide}/gpio/sysfs.rst (100%)