linux-kernel - linux-next: manual merge of the tip tree with the mips 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]

Message-Id: <20091123164607.096bb339.sfr@canb.auug.org.au>
Date:	Mon, 23 Nov 2009 16:46:07 +1100
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,
	Wu Zhangjin <wuzhangjin@...il.com>,
	Ralf Baechle <ralf@...ux-mips.org>,
	Li Hong <lihong.hi@...il.com>
Subject: linux-next: manual merge of the tip tree with the mips tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
scripts/recordmcount.pl between commit
8faf0bcd7be5c9a86223a857f78e033e9cf5f1f5 ("MIPS: Tracing: Add an endian
argument to scripts/recordmcount.pl") from the mips tree and commit
e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
number of arguments in recordmcount.pl") from the tip tree.

Just two updates to the same line.  I fixed it up (using the mips tree
version) and can carry the fix as necessary.  Thanks again, Ralf, for the
heads up.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped