linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <4C8ECDFE.6010906@snapgear.com>
Date:	Tue, 14 Sep 2010 11:21:02 +1000
From:	Greg Ungerer <gerg@...pgear.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the m68knommu tree with the m68k
 tree


Hi Stephen,

Stephen Rothwell wrote:
> 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.

Looks like Geert added the same patch to the m68k git tree.
I'll drop it from the m68knommu git tree.

Thanks
Greg



------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@...pgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
--
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/