Subject: Re: linux-next: manual merge of the pxa tree

From: "Eric Miao" <[email-masked]>
Date: Fri, 19 Sep 2008 03:00:06 +0800

On Fri, Sep 19, 2008 at 2:46 AM, Stephen Rothwell <[email-masked]> 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.