From: Linus Torvalds Date: Tue, 8 Apr 2014 00:52:31 +0000 (-0700) Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b003d7706abc5d75cb58de0c9de8f1fc77e57008;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'kbuild' of git://git./linux/kernel/git/mmarek/kbuild Pull kbuild changes from Michal Marek: - cleanups in the main Makefiles and Documentation/DocBook/Makefile - make O=... directory is automatically created if needed - mrproper/distclean removes the old include/linux/version.h to make life easier when bisecting across the commit that moved the version.h file * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: docbook: fix the include error when executing "make help" kbuild: create a build directory automatically for out-of-tree build kbuild: remove redundant '.*.cmd' pattern from make distclean kbuild: move "quote" to Kbuild.include to be consistent kbuild: docbook: use $(obj) and $(src) rather than specific path kbuild: unconditionally clobber include/linux/version.h on distclean kbuild: docbook: specify KERNELDOC dependency correctly kbuild: docbook: include cmd files more simply kbuild: specify build_docproc as a phony target --- b003d7706abc5d75cb58de0c9de8f1fc77e57008 diff --cc Documentation/DocBook/Makefile index 8d96ebf524e9,ca8fd2628a0f..b444f2e8fe32 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@@ -14,9 -14,9 +14,9 @@@ DOCBOOKS := z8530book.xml device-driver genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ 80211.xml debugobjects.xml sh.xml regulator.xml \ alsa-driver-api.xml writing-an-alsa-driver.xml \ - tracepoint.xml drm.xml media_api.xml + tracepoint.xml drm.xml media_api.xml w1.xml - include $(srctree)/Documentation/DocBook/media/Makefile + include Documentation/DocBook/media/Makefile ### # The build process is as follows (targets):