Subject: [merged] documentation-fix-docbooks=-building.patch removed from -mm tree To: johannes.berg@xxxxxxxxx,mchehab@xxxxxxxxxx,rdunlap@xxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 27 May 2014 13:22:27 -0700 The patch titled Subject: Documentation: fix DOCBOOKS=... building has been removed from the -mm tree. Its filename was documentation-fix-docbooks=-building.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Johannes Berg <johannes.berg@xxxxxxxxx> Subject: Documentation: fix DOCBOOKS=... building Prior to commit 4266129964b8238526936d723de65b419d8069c6 Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Date: Tue May 31 16:27:44 2011 -0300 [media] DocBook: Move all media docbook stuff into its own directory it was possible to build only a single (or more) book(s) by calling, for example make htmldocs DOCBOOKS=80211.xml This now fails: cp: target `.../Documentation/DocBook//media_api' is not a directory Ignore errors from that copy to make this possible again. Fixes: 4266129964b8 ("[media] DocBook: Move all media docbook stuff into its own directory") Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/DocBook/media/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN Documentation/DocBook/media/Makefile~documentation-fix-docbooks=-building Documentation/DocBook/media/Makefile --- a/Documentation/DocBook/media/Makefile~documentation-fix-docbooks=-building +++ a/Documentation/DocBook/media/Makefile @@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ # install_media_images = \ - $(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api + $(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 $(Q)base64 -d $< >$@ _ Patches currently in -mm which might be from johannes.berg@xxxxxxxxx are compilerh-avoid-sparse-errors-in-__compiletime_error_fallback.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html