From: Greg Ungerer <gerg@snapgear.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
gerg@uclinux.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-m68k@vger.kernel.org
Subject: Re: [git pull] m68knommu arch updates
Date: Thu, 10 Dec 2009 14:54:30 +1000 [thread overview]
Message-ID: <4B207F06.2080904@snapgear.com> (raw)
In-Reply-To: <alpine.LFD.2.00.0912091910340.3560@localhost.localdomain>
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
next prev parent reply other threads:[~2009-12-10 4:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-09 7:58 [git pull] m68knommu arch updates Greg Ungerer
2009-12-10 3:13 ` Linus Torvalds
2009-12-10 4:54 ` Greg Ungerer [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-26 2:19 Greg Ungerer
2011-05-24 6:30 Greg Ungerer
2011-01-18 10:35 Greg Ungerer
2010-10-25 0:29 Greg Ungerer
2010-05-25 6:19 Greg Ungerer
2010-03-09 3:47 Greg Ungerer
2009-04-02 4:53 Greg Ungerer
2008-07-24 7:22 Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B207F06.2080904@snapgear.com \
--to=gerg@snapgear.com \
--cc=geert@linux-m68k.org \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox