On 2017-03-03 17:52, Wolfram Sang wrote: > >> Jonathan, Wolfram, do you have any preferences on how this should be >> coordinated regarding the new iio and i2c drivers (and iio changes)? > > You got the acks, all is fine, I think. > >> My plan is to at some point declare the branch immutable. Then both of >> you can pull it in. Or? > > Yup, sounds good. > >> But now that I think about it I wonder what the point is of having >> Greg pull it in also? Sure, third time's a charm and all that, but... > > AFAIU, Greg will be your "upstream", so he should definately pull the > branch. I will just pull it in to avoid merge conflicts in my tree. > Or did I misunderstand your question? You got the gist of it. The piece I was missing was the conditional pull into iio/i2c. If you only pull in order to resolve conflicts it of course makes total sense, thanks. And conflicts -- if they show up -- will probably be trivial given the nature of the series. Famous last words... Cheers, peda -- 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
