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

Date:	Wed, 25 May 2011 11:04:24 +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,
	Greg Ungerer <gerg@...inux.org>
Subject: linux-next: manual merge of the m68knommu tree with Linus' tree

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
from the m68knommu tree.

Two (slightly different) versions of the same change  I used the version
from the m68knommu tree as that was comitted later.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

P.S. Greg, do I need to change your contact address?

Content of type "application/pgp-signature" skipped