On Tuesday 29 December 2015 16:15:09 Rob Herring wrote: > On Mon, Dec 28, 2015 at 4:39 PM, Michael Turquette > <mturquette@xxxxxxxxxxxx> wrote: > > Quoting Eric Anholt (2015-12-24 15:45:15) > >> Michael Turquette <mturquette@xxxxxxxxxxxx> writes: > >> I would *love* to do that, but I've previously been told that having the > >> bindings patch reference a header file not present as of the bindings > >> patch is not acceptable and made to change it. > > > > Ugh, that is annoying. I would think that having code compile properly > > would trump the desire to have all of the documentation merged as one > > patch. > > What about compiling the dts? > > > On the other hand, I've been asked to not take binding descriptions > > through the clk tree. That is a policy that I'm happy to comply with, > > but it is at odds with the recommendation for the header and the binding > > description to be merged together. > > By who? Any bindings in a series I always expect the subsystem > maintainers to take the whole series. That doesn't solve the problem > though as there is still a dependency between a subsystem tree and > arm-soc typically. I don't care too much which tree the binding description goes through either, as long as it is kept in sync. > > DT folks, what is the right way to do this? An immutable, shared branch > > just for a single header file solves the problem, but also feels very > > cumbersome for such a trivial issue. > > Arnd and Olof have been complaining about this problem which is worse > when it is a binding, driver and dts. > > I'm open to maintaining a branch for this purpose if that helps. That > or staggering merging of bindings and drivers/dts are the only ideas > I've come up with. > > How about allowing binding descriptions to be merged without the header > > file, so long as it is merged through another tree? > > I think that is wrong if we have the goal to separate bindings from > the kernel and the bindings should stand on their own. However, if it > greatly simplifies things, i'd be okay with that. The header file is really the main issue we need to worry about. My preferred way of doing this would be to give it an extra merge window: add the binding document and the header file in one merge window, and then add the dts files and the driver one release later. I've seen a lot of header files added for no good reason at all, and at least that way we can get people to think about the dependency more. It's also ok to merge the header file and binding with either the dts file changes or the driver and then do the other part the following release. In the past, we've worked around the issue by merging the driver through arm-soc, or by merging the dts changes through a driver tree, with the appropriate Acks in each case. Both of those approaches work of course, but the former always feels awkward to me as we are not using the right maintainer path, and the latter approach tends to cause merge conflicts, especially when multiple headers for different subsystems get added or the dts files are added at the same time. Having a shared branch for the header file is another way to do it, and we can do that in some cases, but I'd prefer not to make it the default. Arnd -- 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
