From: "Eric Miao" <eric.y.miao@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the pxa tree
Date: Fri, 19 Sep 2008 03:00:06 +0800 [thread overview]
Message-ID: <f17812d70809181200i356f013aoeac6dc1785cacae2@mail.gmail.com> (raw)
In-Reply-To: <20080919044626.bdec6d1a.sfr@canb.auug.org.au>
On Fri, Sep 19, 2008 at 2:46 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Eric,
>
> Today's linux-next merge of the pxa tree got a lot of conflicts against
> the arm tree. Unfortunately, I don't have time today to resolve them, so
> you should probably rebase your tree on the arm tree (or merge the arm
> tree into yours) and resolve the conflicts.
Done. Most of the patches have been merged into the arm tree, so I just
reset the 'for-next' to the mainline again.
Sorry for the noise.
next prev parent reply other threads:[~2008-09-18 19:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-18 18:46 linux-next: manual merge of the pxa tree Stephen Rothwell
2008-09-18 19:00 ` Eric Miao [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-17 20:31 Stephen Rothwell
2008-09-17 21:40 ` Russell King
2008-09-17 22:14 ` Stephen Rothwell
2008-09-17 22:28 ` Russell King
2008-09-18 0:02 ` Stephen Rothwell
2008-09-14 19:27 Stephen Rothwell
[not found] ` <20080915052750.0b0c924c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2008-09-15 13:18 ` Ned Forrester
2008-09-16 3:02 ` Eric Miao
2008-09-25 4:57 ` [spi-devel-general] " David Brownell
2008-09-25 7:49 ` Eric Miao
[not found] ` <f17812d70809250049g3f3b86e7x12dab8cc4f8b1cd6-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-09-25 8:20 ` David Brownell
2008-09-11 22:35 Stephen Rothwell
2008-09-12 0:49 ` Eric Miao
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=f17812d70809181200i356f013aoeac6dc1785cacae2@mail.gmail.com \
--to=eric.y.miao@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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