linux-kernel - linux-next: manual merge of the m68knommu tree with the m68k 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>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 14 Sep 2010 10:51:29 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christian Dietrich <qy03fugy@...d.informatik.uni-erlangen.de>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/sun3/sun3ints.c between commit
72fe185cd9acbfc6e8a7afa884ae1152be706e52 ("m68k/m68knommu: Remove dead
SMP config option") from the m68k tree and commit
5313b581e4efc214c6132d32f580db6668e5c5a8 ("arch/m68k{,nommu}: Removing
dead SMP config option") from the m68knommu tree.

These appear to be the same patch with some formatting differences.  I
used the version from the m68k tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped