* FAILED: patch "[PATCH] docs: Fix build failure" failed to apply to 4.9-stable tree
@ 2017-01-06 12:48 gregkh
2017-01-06 13:10 ` Jonathan Corbet
0 siblings, 1 reply; 2+ messages in thread
From: gregkh @ 2017-01-06 12:48 UTC (permalink / raw)
To: john, corbet; +Cc: stable
The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 66115335fbb411365c23349b2fbe7e041eabbaf2 Mon Sep 17 00:00:00 2001
From: John Brooks <john@fastquake.com>
Date: Fri, 23 Dec 2016 00:53:10 +0000
Subject: [PATCH] docs: Fix build failure
The 80211.tmpl DocBook file was removed in commit 819bf593767c ("docs-rst:
sphinxify 802.11 documentation"), but the 80211.xml target was re-added to
the Makefile by commit 7ddedebb03b7 ("ALSA: doc: ReSTize
writing-an-alsa-driver document"), leading to a failure when building the
documentation:
*** No rule to make target 'Documentation/DocBook/80211.xml', needed by
'Documentation/DocBook/80211.aux.xml'.
cc: stable@vger.kernel.org
Signed-off-by: John Brooks <john@fastquake.com>
Mea-culpa-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index c75e5d6b8fa8..a6eb7dcd4dd5 100644
--- 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),)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: FAILED: patch "[PATCH] docs: Fix build failure" failed to apply to 4.9-stable tree
2017-01-06 12:48 FAILED: patch "[PATCH] docs: Fix build failure" failed to apply to 4.9-stable tree gregkh
@ 2017-01-06 13:10 ` Jonathan Corbet
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2017-01-06 13:10 UTC (permalink / raw)
To: gregkh; +Cc: john, stable
On Fri, 06 Jan 2017 13:48:12 +0100
<gregkh@linuxfoundation.org> wrote:
> The patch below does not apply to the 4.9-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
Please ignore this one, it's a 4.10 problem. I'm not quite sure what I
was thinking when I put the stable tag on it. Sorry for the noise.
jon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-06 13:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-06 12:48 FAILED: patch "[PATCH] docs: Fix build failure" failed to apply to 4.9-stable tree gregkh
2017-01-06 13:10 ` Jonathan Corbet
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.