On Mon, Nov 14, 2016 at 11:42:16AM +0000, Peter Griffin wrote: > Hi Vinod, > > On Mon, 14 Nov 2016, Vinod Koul wrote: > > > On Mon, Nov 07, 2016 at 01:57:35PM +0000, Peter Griffin wrote: > > > > > > > > As you now make changes to the entire remoteproc Kconfig file, rather > > > > than simply add a Kconfig symbol we can't bring this in via Vinod's tree > > > > without providing Linus with a messy merge conflict. > > > > > > > > So the remoteproc parts now has to go through my tree. > > > > > > OK, I think the best approach is for Vinod to create an immutable > > > branch with the entire fdma series on, and then both of you merge that branch into > > > your respective trees. > > > > my topic/st_fdma is immutable branch. You cna merge it, if you need a signed > > tag, please do let me know > > OK. > > > > > > > > > That way there won't be any conflicts and you can both accept further changes > > > for v4.9 release. Trying to take half the series via rproc, and half via dma trees won't work > > > because they have dependencies on each other. > > > > > > I will send a v11 series in a moment which includes the feedback in this email > > > and also include the additional fixes which Vinod has applied since the driver > > > has been in linux-next. > > > > WHY.. Stuff is already merged twice! > > When the feedback is "there is an unrelated change in this patch", the only way > you can fix that is by having a new version of the patch. It can be reverted and clean patch applied.. -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
