Hi all, On Wed, 08 Feb 2017 21:42:47 +0200 Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote: > > On Wed, 2017-02-08 at 18:47 +0100, Greg KH wrote: > > On Wed, Feb 08, 2017 at 06:31:10PM +0200, Andy Shevchenko wrote: > > > > > > It requires to have immutable branch in one of the subsystem which > > > the > > > other one can pull. > > > > Which sucks, and is why you should not do api changes this way! > > Not only me :-) > > If above will not work we may do something like below for this cycle: > > static inline ... devm_get_gpiod_from_child() > { > return devm_fwnode_get_gpiod_from_child(..., GPIO_AS_IS, "?"); > } > > in GPIO tree. I will use Lee's patch as a merge resolution when I merge the gpio tree (as that is later in my list) from now on. All that has to happen now is that whichever tree is merged last by Linus (Torvalds) has to have this same merge resolution applied. In general, it is better if API changes can be done either as Greg suggested or with a separate immutable topic branch merged into whichever trees need it, but it doesn't happen that way very often, so this is what we generally do. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html