mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Mahoney <jeffm@suse.com>
To: Johannes Berg <johannes.berg@intel.com>,
	Jonathan Corbet <corbet@lwn.net>,
	Linux Kernel Maling List <linux-kernel@vger.kernel.org>
Subject: [PATCH] Docbook: re-remove 80211.xml from Makefile
Date: Thu, 29 Dec 2016 12:27:38 -0500	[thread overview]
Message-ID: <e0f8ed42-3d3c-bbd7-d573-d0ab129ee448@suse.com> (raw)

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 <jeffm@suse.com>
---
 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

             reply	other threads:[~2016-12-29 17:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-29 17:27 Jeff Mahoney [this message]
2016-12-29 17:33 ` Jonathan Corbet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e0f8ed42-3d3c-bbd7-d573-d0ab129ee448@suse.com \
    --to=jeffm@suse.com \
    --cc=corbet@lwn.net \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome