From: Ned Forrester <nforrester-/d+BM93fTQY@public•gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org>
Cc: spi-devel
<spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public•gmane.org>,
linux-next-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>
Subject: Re: linux-next: manual merge of the pxa tree
Date: Mon, 15 Sep 2008 09:18:30 -0400 [thread overview]
Message-ID: <48CE60A6.4000705@whoi.edu> (raw)
In-Reply-To: <20080915052750.0b0c924c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
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=/
next prev parent reply other threads:[~2008-09-15 13:18 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 [this message]
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
-- 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=48CE60A6.4000705@whoi.edu \
--to=nforrester-/d+bm93ftqy@public$(echo .)gmane.org \
--cc=eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public$(echo .)gmane.org \
--cc=spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public$(echo .)gmane.org \
/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