linux-kernel - linux-next: manual merge of the tip tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 1 Jul 2010 14:05:26 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Amerigo Wang <amwang@...hat.com>, Michal Marek <mmarek@...e.cz>
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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/