Ben Dooks <ben-i2c@xxxxxxxxx> writes: > On Tue, Jul 05, 2011 at 12:00:56PM -0700, Kevin Hilman wrote: >> Hi Ben, >> >> On Mon, 2011-06-27 at 15:15 -0700, Kevin Hilman wrote: >> > On Mon, 2011-06-27 at 15:12 -0700, Kevin Hilman wrote: >> > >> > > Ping. I don't see this in linux-next yet. >> > > >> > > Are you planning to queue this for v3.1? >> > > >> > >> > Oops, pushed send too soon on this... >> > >> > As this series touches various data files in arch/arm/mach-omap2/* and >> > we have a handful of other changes to that data for this merge window, I >> > think it would be better for conflict avoidance if this series is merged >> > via Tony's linux-omap tree. >> > >> > With your Ack, we'll merge it via OMAP. >> >> I see that the same day I sent this, you merged it into your next-i2c >> branch. Guess I was too late with my request. >> >> As I mentioned above, we will have several conflicts with the >> arch/arm/mach-omap2 changes in this series, so we would prefer to merge >> them via the OMAP tree if at all possible so we can properly handle the >> conflicts. >> >> Do you mind dropping it from your next-i2c so we can merge it via >> linux-omap (with your Ack.) > > Yes, and if you could indicate all the other omap i2c patches and I'll > add my ack to yours. > > Acked-by: Ben Dooks <ben-linux@xxxxxxxxx> Thanks, I will refresh/repost any remaining OMAP I2C patches today and let you know. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
