Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754274AbZLJEys (ORCPT ); Wed, 9 Dec 2009 23:54:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753917AbZLJEys (ORCPT ); Wed, 9 Dec 2009 23:54:48 -0500 Received: from rex.securecomputing.com ([203.24.151.4]:41737 "EHLO cyberguard.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752809AbZLJEyr (ORCPT ); Wed, 9 Dec 2009 23:54:47 -0500 Message-ID: <4B207F06.2080904@snapgear.com> Date: Thu, 10 Dec 2009 14:54:30 +1000 From: Greg Ungerer User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Linus Torvalds CC: Geert Uytterhoeven , gerg@uclinux.org, Linux Kernel Mailing List , linux-m68k@vger.kernel.org Subject: Re: [git pull] m68knommu arch updates References: <200912090758.nB97wPok013748@goober.internal.moreton.com.au> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1161 Lines: 33 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@snapgear.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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/