From: Grant Likely <grant.likely@secretlab.ca>
To: Benoit Cousson <b-cousson@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org
Subject: Re: [PATCH 0/4] spi/omap: Adaptation to Device Tree
Date: Wed, 15 Feb 2012 13:03:58 -0700 [thread overview]
Message-ID: <20120215200358.GB25779@ponder.secretlab.ca> (raw)
In-Reply-To: <1329327457-2121-1-git-send-email-b-cousson@ti.com>
On Wed, Feb 15, 2012 at 06:37:33PM +0100, Benoit Cousson wrote:
> Hi Grant,
>
> You might think I'm harassing you with all these series, but it looks like
> you are the maintainer of all the stuff I care about for the moment :-)
>
> Here are a couple of SPI patches + the addition of a SPI ethernet device
> needed for sdp4430 board.
>
> This driver is still relying on a valid bus_number which is clearly bad.
> A cleanup is definitively needed, and will be done later.
>
> This series is based on lo/master (a37cdd9) + for_3.4/dt_base branch to get
> the needed cleanup and fixes for OMAP.
>
> Please note that due to the changes in the various OMAP DTS files, I have
> to base this series on top of my other DT series (gpio for example), otherwise
> the merge of the two series will generate some merge conflict in the DTS since
> they are both adding some new nodes at the exact same location.
Merge conflicts of this type are just fine when they are both adding new stuff.
The resolution of such conflicts are easy.
g.
prev parent reply other threads:[~2012-02-15 20:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 17:37 [PATCH 0/4] spi/omap: Adaptation to Device Tree Benoit Cousson
2012-02-15 17:37 ` [PATCH 1/4] spi/omap: Add DT support to McSPI driver Benoit Cousson
2012-02-15 19:34 ` Rob Herring
2012-02-15 20:04 ` Grant Likely
2012-02-15 21:10 ` Cousson, Benoit
2012-02-15 17:37 ` [PATCH 2/4] arm/dts: OMAP4: Add SPI controller nodes Benoit Cousson
2012-02-15 20:02 ` Grant Likely
[not found] ` <20120215200240.GA25779-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2012-02-15 21:00 ` Cousson, Benoit
2012-02-15 17:37 ` [PATCH 3/4] arm/dts: OMAP3: " Benoit Cousson
2012-02-15 17:37 ` [PATCH 4/4] arm/dts: omap4-sdp: Add ks8851 ethernet SPI device Benoit Cousson
2012-02-15 20:03 ` Grant Likely [this message]
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=20120215200358.GB25779@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).