linux-kernel - linux-next: manual merge of the rr tree with Linus' 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:	Mon, 6 Jul 2009 12:05:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tim Anderson <tanderson@...sta.com>,
	Ralf Baechle <ralf@...ux-mips.org>,
	Mike Travis <travis@....com>
Subject: linux-next: manual merge of the rr tree with Linus' tree

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/mips/kernel/smp-cmp.c between commit
0365070f05f12f1648b4adf22cfb52ec7a8a371c ("MIPS: CMP: activate CMP
support") from Linus' tree and commit
e7cb633472a7c3b197e2696e6a3d19a981e8988f
("cpumask:use-cpumap-accessors-mips") from the rr tree.

The former removes the code that the latter modifies in this file, so I
used the former version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped