From: "Hebbar, Gururaja" <gururaja.hebbar@ti.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
"Hilman, Kevin" <khilman@ti.com>,
"davinci-linux-open-source@linux.davincidsp.com"
<davinci-linux-open-source@linux.davincidsp.com>,
Chris Ball <cjb@laptop.org>,
Russell King <linux@arm.linux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Balbi, Felipe" <balbi@ti.com>,
Wolfram Sang <w.sang@pengutronix.de>,
Grant Likely <grant.likely@secretlab.ca>,
Alan Stern <stern@rowland.harvard.edu>,
Ben Dooks <ben-linux@fluff.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
David Woodhouse <dwmw2@infradead.org>,
"Girdwood, Liam" <lrg@ti.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: RE: [PATCH 02/16] ARM: davinci: move platform_data definitions
Date: Thu, 13 Sep 2012 07:00:54 +0000 [thread overview]
Message-ID: <1BAFE6F6C881BF42822005164F1491C33EA811E3@DBDE01.ent.ti.com> (raw)
In-Reply-To: <201209121711.10715.arnd@arndb.de>
On Wed, Sep 12, 2012 at 22:41:09, Arnd Bergmann wrote:
> On Wednesday 12 September 2012, Hebbar, Gururaja wrote:
> > On Tue, Sep 11, 2012 at 18:29:36, Arnd Bergmann wrote:
>
> > > drivers/usb/musb/da8xx.c | 2 +-
> >
> >
> > > .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
> >
> >
> > This will clash with patch "ASoC/ARM: Davinci: McASP: split asp header into
> > platform and audio specific" queued in ASoC tree by Mark
> >
>
> Ok, I've taken out that hunk, this is the remaining patch. There will
> still be minor conflicts though, because it changes some adjacent lines.
>
> Arnd
Thanks for the consideration.
>
>
..snip..
..snip..
Regards,
Gururaja
next prev parent reply other threads:[~2012-09-13 7:02 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja [this message]
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 17:29 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi
2012-09-19 14:49 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
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=1BAFE6F6C881BF42822005164F1491C33EA811E3@DBDE01.ent.ti.com \
--to=gururaja.hebbar@ti.com \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=ben-linux@fluff.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cjb@laptop.org \
--cc=davinci-linux-open-source@linux.davincidsp.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lrg@ti.com \
--cc=mchehab@infradead.org \
--cc=stern@rowland.harvard.edu \
--cc=w.sang@pengutronix.de \
/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).