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

Message-ID: <alpine.LFD.2.00.0912091910340.3560@localhost.localdomain>
Date:	Wed, 9 Dec 2009 19:13:25 -0800 (PST)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Greg Ungerer <gerg@...pgear.com>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
cc:	gerg@...inux.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-m68k@...r.kernel.org
Subject: Re: [git pull] m68knommu arch updates



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.

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