From: "Eric Miao" <eric.y.miao@gmail•com>
To: Ned Forrester <nforrester@whoi•edu>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org,
spi-devel <spi-devel-general@lists•sourceforge.net>
Subject: Re: linux-next: manual merge of the pxa tree
Date: Tue, 16 Sep 2008 11:02:50 +0800 [thread overview]
Message-ID: <f17812d70809152002p6df35c05o743d9d86fca37827@mail.gmail.com> (raw)
In-Reply-To: <48CE60A6.4000705@whoi.edu>
On Mon, Sep 15, 2008 at 9:18 PM, Ned Forrester <nforrester@whoi•edu> wrote:
> Stephen Rothwell wrote:
>> Hi Eric,
>>
>> Today's linux-next merge of the pxa tree got a conflict in
>> drivers/spi/pxa2xx_spi.c between commit
>> 8423597d676615f3dd2d9ab36f59f147086b90b8 ("pxa2xx_spi: chipselect
>> bugfixes") from Linus' tree and commit
>> 5625ef19d54c02838c867b6a5c87823e021ac7a5 ("spi: pxa2xx_spi introduce chip
>> select gpio to simplify the common cases") from the pxa tree.
>>
>> I fixed it up (see below) and can carry the fixup (though it could be
>> fixed in the pxa tree in a merge with Linus' tree). Please check the
>> fixup.
>
> The last word I had from David Brownell, was that Eric should make his
> patch fit after mine. I think Eric was planning to re-submit, but maybe
> you have saved him the trouble. I will leave it to Eric to decide if
> you fixed everything needed.
>
I'll take off the patch to save Stephen's time on this. Sorry for the
noise.
- eric
next prev parent reply other threads:[~2008-09-16 3:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-14 19:27 linux-next: manual merge of the pxa tree 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 [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2008-09-18 18:46 Stephen Rothwell
2008-09-18 19:00 ` Eric Miao
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-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=f17812d70809152002p6df35c05o743d9d86fca37827@mail.gmail.com \
--to=eric.y.miao@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nforrester@whoi$(echo .)edu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=spi-devel-general@lists$(echo .)sourceforge.net \
/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