2016-12-29 17:27:44

by Jeff Mahoney

Subject: [PATCH] Docbook: re-remove 80211.xml from Makefile

Merge commit 726d661fea3 (Merge remote-tracking branch 'sound/topic/restize-docs' into sound)
accidentally re-added 80211.xml to the DocBook Makefile, but
commit 819bf593767 (docs-rst: sphinxify 802.11 documentation) removed
80211.tmpl and the rule from the Makefile. As a result, we get build
failures for docs:
make[2]: *** No rule to make target 'Documentation/DocBook/80211.xml', needed by 'Documentation/DocBook/80211.9'. Stop.

This patch re-removes the 80211 rule.

Fixes: 726d661fea3 (Merge remote-tracking branch 'sound/topic/restize-docs' into sound)
Signed-off-by: Jeff Mahoney <[email protected]>
---
Documentation/DocBook/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \
kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
- 80211.xml sh.xml regulator.xml w1.xml \
+ sh.xml regulator.xml w1.xml \
writing_musb_glue_layer.xml iio.xml

ifeq ($(DOCBOOKS),)

--
Jeff Mahoney
SUSE Labs

2016-12-29 17:34:01

by Jonathan Corbet

Subject: Re: [PATCH] Docbook: re-remove 80211.xml from Makefile

On Thu, 29 Dec 2016 12:27:38 -0500
Jeff Mahoney <[email protected]> wrote:

> Merge commit 726d661fea3 (Merge remote-tracking branch 'sound/topic/restize-docs' into sound)
> accidentally re-added 80211.xml to the DocBook Makefile, but
> commit 819bf593767 (docs-rst: sphinxify 802.11 documentation) removed
> 80211.tmpl and the rule from the Makefile. As a result, we get build
> failures for docs:
> make[2]: *** No rule to make target 'Documentation/DocBook/80211.xml', needed by 'Documentation/DocBook/80211.9'. Stop.
>
> This patch re-removes the 80211 rule.

I already have a fix for this in docs-next, will be sending it Linusward
shortly.

Thanks (and apologies for the merge screwup),

jon