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

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

[Ned Forrester]

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.

-- 
Ned Forrester                                       nforrester-/d+BM93fTQY@public.gmane.org
Oceanographic Systems Lab                                  508-289-2226
Applied Ocean Physics and Engineering Dept.
Woods Hole Oceanographic Institution          Woods Hole, MA 02543, USA
http://www.whoi.edu/sbl/liteSite.do?litesiteid=7212
http://www.whoi.edu/hpb/Site.do?id=1532
http://www.whoi.edu/page.do?pid=10079


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

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

[Eric Miao]

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

Re: [spi-devel-general] linux-next: manual merge of the pxa tree

[David Brownell]

On Monday 15 September 2008, Eric Miao wrote:
> >> 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.

Uh, I have yet to see any version of this patch... could someone post
it so the SPI maintainer at least has a chance to look at it?

Re: [spi-devel-general] linux-next: manual merge of the pxa tree

[Eric Miao]

On Thu, Sep 25, 2008 at 12:57 PM, David Brownell <david-b@pacbell.net> wrote:
> On Monday 15 September 2008, Eric Miao wrote:
>> >> 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.
>
> Uh, I have yet to see any version of this patch... could someone post
> it so the SPI maintainer at least has a chance to look at it?
>

Expect a week or two before this happen, I'm currently busy with
other stuffs. Sorry for the delay.

-- 
Cheers
- eric

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

[David Brownell]

On Thursday 25 September 2008, Eric Miao wrote:
> > Uh, I have yet to see any version of this patch... could someone post
> > it so the SPI maintainer at least has a chance to look at it?
> >
> 
> Expect a week or two before this happen, I'm currently busy with
> other stuffs. Sorry for the delay.

I thought the situation was that there was a working version
that hadn't been sent to the SPI list ...

If that's not the case, no worries.



-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/