From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Josh Boyer <jwboyer@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Tanmay Inamdar <tinamdar@apm.com>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the 4xx tree with the powerpc tree
Date: Fri, 09 Dec 2011 15:41:42 +1100 [thread overview]
Message-ID: <1323405702.19891.7.camel@pasglop> (raw)
In-Reply-To: <CA+5PVA5vVC=e24imM0QxbT10kBAF4v=kwheKs7cOHKKcC+if=A@mail.gmail.com>
On Thu, 2011-12-08 at 20:46 -0500, Josh Boyer wrote:
> On Thu, Dec 8, 2011 at 8:38 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Josh,
> >
> > Today's linux-next merge of the 4xx tree got a conflict in
> > arch/powerpc/platforms/40x/ppc40x_simple.c between commit 11eab297f57b
> > ("powerpc: Add support for OpenBlockS 600") from the powerpc tree and
> > commit d5b9ee7b514e ("powerpc/40x: Add APM8018X SOC support") from the
> > 4xx tree.
>
> I blame BenH. I sent him a pull request with d5b9ee7b514e in it
> before he went and updated his tree. Still not pulled afaik. Guess
> I'll be rebasing my next branch tomorrow to pick up a series from Tony
> Breeds, unless Ben handles the outstanding pull before I wake up :).
Don't bother rebasing, I can deal with a minor merge conflict like
that :-)
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Looks correct to me. Hopefully you won't have to carry it long.
> >
> > [Josh: I have changed you contact address to the above]
Cheers,
Ben.
prev parent reply other threads:[~2011-12-09 4:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-09 1:38 linux-next: manual merge of the 4xx tree with the powerpc tree Stephen Rothwell
2011-12-09 1:46 ` Josh Boyer
2011-12-09 1:51 ` Stephen Rothwell
2011-12-09 4:41 ` Benjamin Herrenschmidt [this message]
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=1323405702.19891.7.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=jwboyer@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=tinamdar@apm.com \
/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;
as well as URLs for NNTP newsgroup(s).