On Mon, Feb 15, 2021 at 11:07:56AM +0000, Jonathan Cameron wrote: > Hi Cristian, > > So this driver will also be 5.13 material now (merge window for IIO > effectively > closes 1-2 weeks before Linus opens the main one). >
I guessed so. > The way we normally handle cases like this where we likely to have > dependencies > on a patch set from two separate directions is to do what is known as an > immutable branch. This is a branch that would probably be based on 5.12-rc1 > containing just this driver. > Make sense. > Then both trees, in this case IIO and scmi merge that branch. The magic > of git then means that when Linus gets the eventual pull requests for > the two trees, the git IDs and content will be the same and the history > of that particular set of files will be cleanly maintained. > > This happens quite a lot for certain parts of the kernel because there are > a lot of cross dependencies. > > @Sudeep, that work for you? Have to wait for 5.12-rc1 though to give > us a sensible base. > Since this is just one patch, I can pull in the immutable branch if you could share and then Cristian can make appropriate changes needed for his series on top of that unless you want to merge 30+ patches that I might have with Cristain series 😉. In short I am happy to pull in your immutable branch and I agree 5.12-rc1 is sensible base. -- Regards, Sudeep
