On Tue, Jun 05, 2012 at 10:37:36PM +0530, Laxman Dewangan wrote: > On Tuesday 05 June 2012 09:44 PM, Stephen Warren wrote: > >On 06/05/2012 07:09 AM, Laxman Dewangan wrote: > >>This patch series having the: > >>- Handling of late register write due to Tegra PPSB design. > >>- support for I2C_M_NOSTART > >>- Use devm_* for all allocation. > >The series, > > > >Acked-by: Stephen Warren<swarren@xxxxxxxxxxxxx> > > > >Note that patch 4 touches context adjacent to Prashant's "i2c: tegra: > >Add clk_prepare/clk_unprepare" patch, which I hope to take through the > >Tegra tree since it's a requirement for the Tegra common clock > >conversion. I don't think this will cause any significant conflict, but > >perhaps it's worth resolving it explicitly. Is it really a requirement? Just wondering if it will cause problems, if Prashant's patch goes in via I2C after arm-soc has been merged. I am fine with simply acking the patch, though. > >Wolfram, perhaps we should put these 4 patches and Prashan'ts into their > >own topic branch so that you can merge it into the I2C tree, and I can > >merge it into the Tegra tree too? Or, I can take everything through > >Tegra if you want, and ack it. Laxman's patches should really go via I2C, I think. Can't we just fix the conflict in arm-soc? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
