From: Nishanth Menon Date: Thu, 20 Feb 2014 22:31:00 -0600 Subject: [U-Boot] [PATCH] kbuild: fix errors of 'make *tags' and 'make cscope' In-Reply-To: <1392954998-12721-1-git-send-email-yamada.m@jp.panasonic.com> References: <1392954998-12721-1-git-send-email-yamada.m@jp.panasonic.com> Message-ID: <20140221043100.GA29725@kahuna> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Masahiro-san, On 12:56-20140221, Masahiro Yamada wrote: > Signed-off-by: Masahiro Yamada > Reported-by: Nishanth Menon > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index b91381c..a06abec 100644 > --- a/Makefile > +++ b/Makefile > @@ -414,7 +414,7 @@ version_h := include/generated/version_autogenerated.h > timestamp_h := include/generated/timestamp_autogenerated.h > > no-dot-config-targets := clean clobber mrproper distclean \ > - cscope TAGS %tags help %docs check% coccicheck \ > + help %docs check% coccicheck \ > ubootversion backup ^^ unfortunately, the patch fails to apply $ git describe v2014.04-rc1 $ wget -O a.patch http://patchwork.ozlabs.org/patch/322408/mbox/ --2014-02-20 22:24:24-- http://patchwork.ozlabs.org/patch/322408/mbox/ Length: unspecified [text/plain] Saving to: `a.patch' [ <=> ] 1,011 --.-K/s in 0s $ git am a.patch Applying: kbuild: fix errors of 'make *tags' and 'make cscope' error: patch failed: Makefile:414 error: Makefile: patch does not apply Patch failed at 0001 kbuild: fix errors of 'make *tags' and 'make cscope' When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". $ git am --abort $ patch -p1