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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Wed, 9 Nov 2011 17:08:09 +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>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k
 tree

Hi Stephen,

On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove obsolete
> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
> tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks. Both this and the previous m68k merge conflict patch look good.

Geert: would you prefer I hold off on these 2 patches until after
you merge your IRQ changes?

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@...pgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
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/