From: Sam Ravnborg <sam@ravnborg.org>
To: Greg Ungerer <gerg@snapgear.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org,
Harvey Harrison <harvey.harrison@gmail.com>
Subject: Re: linux-next: manual merge of the m68knommu tree with Linus' treee
Date: Tue, 20 Jan 2009 08:06:09 +0100 [thread overview]
Message-ID: <20090120070609.GA16511@uranus.ravnborg.org> (raw)
In-Reply-To: <497519A8.3020706@snapgear.com>
On Tue, Jan 20, 2009 at 10:24:08AM +1000, Greg Ungerer wrote:
> Hi Stephen,
>
> Stephen Rothwell wrote:
> >Today's linux-next merge of the m68knommu tree got a conflict in
> >arch/m68knommu/include/asm/Kbuild between commit
> >74d96f018673759d04d032c137d132f6447bfb1e ("byteorder: make swab.h include
> >asm/swab.h like a regular header") from Linus' tree and commit
> >49148020bcb6910ce71417bd990a5ce7017f9bd3 ("m68k,m68knommu: merge header
> >files") from the m68knommu tree.
> >
> >The latter removed the file and the former removed a line from it. So I
> >just removed the file. I can keep doing that or you could do a merge
> >with Linus' tree.
>
> The current thinking was to merge this with Linus' tree as quick
> as possible. But at the very least that will have to wait till he
> gets back from LCA.
Just try to push it to Linus. He may very well take it depite
having fun at LCA.
It is:
- only touching m68k and m68knommu
- he is usual quick to take the header move patches
- it removes more lines than it add (IIRC)
Sam
next prev parent reply other threads:[~2009-01-20 7:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-19 23:55 linux-next: manual merge of the m68knommu tree with Linus' treee Stephen Rothwell
2009-01-20 0:24 ` Greg Ungerer
2009-01-20 7:06 ` Sam Ravnborg [this message]
2009-01-21 0:59 ` 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=20090120070609.GA16511@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=gerg@snapgear.com \
--cc=harvey.harrison@gmail.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.