Messages in this thread | | | Date | Thu, 1 Jul 2010 14:05:26 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the kbuild tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in Makefile between commit 01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b ("Makefile: "make kernelrelease" should show the correct full kernel version") from the kbuild tree and commit 8e5564e6c7554902301543e731354ad2ad58ae53 ("perf tools: Make target to generate self contained source tarball") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc Makefile index c0581a9,f6c206a..0000000 --- a/Makefile +++ b/Makefile @@@ -412,9 -412,9 +412,9 @@@ endi # of make so .config is not included in this case either (for *config). no-dot-config-targets := clean mrproper distclean \ - cscope TAGS tags help %docs check% \ + cscope TAGS tags help %docs check% coccicheck \ include/linux/version.h headers_% \ - kernelversion - kernelrelease kernelversion %src-pkg ++ kernelversion %src-pkg config-targets := 0 mixed-targets := 0
| |