linux-kernel - Re: [git pull] m68knommu arch updates

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] [day] [month] [year] [list]

Date:	Thu, 10 Dec 2009 14:54:30 +1000
From:	Greg Ungerer <gerg@...pgear.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
CC:	Geert Uytterhoeven <geert@...ux-m68k.org>, gerg@...inux.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-m68k@...r.kernel.org
Subject: Re: [git pull] m68knommu arch updates


Hi Linus,

Linus Torvalds wrote:
> 
> On Wed, 9 Dec 2009, Greg Ungerer wrote:
>> Please pull to get the latest m68knommu arch fixes. Not a lot in here,
>> mostly small fixes. The biggest change is Tim Abbott's linker script
>> cleanups.
> 
> Hmm. I got a conflict due to the other m68k changes on the file 
> arch/m68k/include/asm/ptrace.h.
> 
> I fixed it up the way that seemed most appropriate, but somebody should 
> double-check. My resolution is not identical to either source branch tree.

The end result looks fine to me.

Regards
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/