[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1BAFE6F6C881BF42822005164F1491C33EA811E3@DBDE01.ent.ti.com>
Date: Thu, 13 Sep 2012 07:00:54 +0000
From: "Hebbar, Gururaja" <gururaja.hebbar@...com>
To: Arnd Bergmann <arnd@...db.de>
CC: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
"Hilman, Kevin" <khilman@...com>,
"davinci-linux-open-source@...ux.davincidsp.com"
<davinci-linux-open-source@...ux.davincidsp.com>,
Chris Ball <cjb@...top.org>,
Russell King <linux@....linux.org.uk>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"Balbi, Felipe" <balbi@...com>,
Wolfram Sang <w.sang@...gutronix.de>,
Grant Likely <grant.likely@...retlab.ca>,
Alan Stern <stern@...land.harvard.edu>,
Ben Dooks <ben-linux@...ff.org>,
Mauro Carvalho Chehab <mchehab@...radead.org>,
David Woodhouse <dwmw2@...radead.org>,
"Girdwood, Liam" <lrg@...com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: RE: [PATCH 02/16] ARM: davinci: move platform_data definitions
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists