drivers/pci/iomap.c was accidentally added to the Documentation
generation at two places.
Remove it from Documentation/driver-api/device-io.rst to resolve the
collision.
Reported-by: Stephen Rothwell <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Fixes: 025bbeb5c880 ("lib: move pci_iomap.c to drivers/pci/")
Signed-off-by: Philipp Stanner <[email protected]>
---
As discussed with Bjorn; this will be squashed into the series that
caused the problem, in PCI.
---
Documentation/driver-api/device-io.rst | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst
index d9ba2dfd1239..5c7e8194bef9 100644
--- a/Documentation/driver-api/device-io.rst
+++ b/Documentation/driver-api/device-io.rst
@@ -517,6 +517,3 @@ Public Functions Provided
.. kernel-doc:: arch/x86/include/asm/io.h
:internal:
-
-.. kernel-doc:: drivers/pci/iomap.c
- :export:
--
2.43.0
On Mon, Feb 12, 2024 at 04:09:34PM +0100, Philipp Stanner wrote:
> drivers/pci/iomap.c was accidentally added to the Documentation
> generation at two places.
>
> Remove it from Documentation/driver-api/device-io.rst to resolve the
> collision.
>
> Reported-by: Stephen Rothwell <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Fixes: 025bbeb5c880 ("lib: move pci_iomap.c to drivers/pci/")
> Signed-off-by: Philipp Stanner <[email protected]>
Squashed into pci/devres, thanks!
> ---
> As discussed with Bjorn; this will be squashed into the series that
> caused the problem, in PCI.
> ---
> Documentation/driver-api/device-io.rst | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst
> index d9ba2dfd1239..5c7e8194bef9 100644
> --- a/Documentation/driver-api/device-io.rst
> +++ b/Documentation/driver-api/device-io.rst
> @@ -517,6 +517,3 @@ Public Functions Provided
>
> .. kernel-doc:: arch/x86/include/asm/io.h
> :internal:
> -
> -.. kernel-doc:: drivers/pci/iomap.c
> - :export:
> --
> 2.43.0
>