* Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> [130730 00:41]: > On 07/30/2013 09:08 AM, Tony Lindgren wrote: > > Looking at this patch there's a pretty high probability of introducing > > pointless merge conflicts. > > > > How about do the platform data related changes as a separate follow-up > > series? You can typically do this by keeping the old features around, > > then doing a separate series to rename or remove the users later on. > > This will remove the dependency between platform data and the driver > > changes. > > I can do this. This will work of for the driver name but not for the > name the platform_data struct. To address this part you could create a > separate branch on top of -rc3 or so which contains only this change(s) > and Felipe and you merge this branch so there won't be any conflicts. A separate minimal branch against -rc3 sounds good to me. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
