Re: [PATCH 1/1] doc: remove duplicate page inclusion

2021-12-21 Thread Tom Rini
On Tue, Dec 21, 2021 at 09:00:44AM +0100, Heinrich Schuchardt wrote:

> doc/usage/index.rst in branch origin/next includes usage/environment twice.
> Remove the duplicate entry.
> 
> Signed-off-by: Heinrich Schuchardt 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature


Re: [PATCH 1/1] doc: remove duplicate page inclusion

2021-12-21 Thread Tom Rini
On Tue, Dec 21, 2021 at 09:00:44AM +0100, Heinrich Schuchardt wrote:

> doc/usage/index.rst in branch origin/next includes usage/environment twice.
> Remove the duplicate entry.
> 
> Signed-off-by: Heinrich Schuchardt 
> ---
> Hello Tom,
> 
> this seems to be merge error. We need this patch to build 'make htmldocs'.
> Please, apply to origin/next without further pull request.

I'm applying this note.  Just for the record, CI is passing:
https://source.denx.de/u-boot/u-boot/-/jobs/367582
and also passed before I pushed to next itself:
https://source.denx.de/u-boot/u-boot/-/jobs/367539

-- 
Tom


signature.asc
Description: PGP signature


[PATCH 1/1] doc: remove duplicate page inclusion

2021-12-21 Thread Heinrich Schuchardt
doc/usage/index.rst in branch origin/next includes usage/environment twice.
Remove the duplicate entry.

Signed-off-by: Heinrich Schuchardt 
---
Hello Tom,

this seems to be merge error. We need this patch to build 'make htmldocs'.
Please, apply to origin/next without further pull request.

Best regards

Heinrich
---
 doc/usage/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/usage/index.rst b/doc/usage/index.rst
index 3905540735..33761af96a 100644
--- a/doc/usage/index.rst
+++ b/doc/usage/index.rst
@@ -11,7 +11,6 @@ Use U-Boot
netconsole
partitions
cmdline
-   environment
 
 Shell commands
 --
-- 
2.33.1