On Mon, Sep 25, 2017 at 10:53:01AM -0400, Doug Ledford wrote: > On 9/24/2017 11:59 PM, Leon Romanovsky wrote: > > On Sat, Sep 23, 2017 at 11:03:25AM -0400, Doug Ledford wrote: > > > > <...> > > > >> > >> I want any shared pull requests to be based on nothing newer than an > >> rc2 kernel. I branch my for-next branch at rc2, so if your pull > >> request is on something later it will pollute my main for-next branch > >> to merge it. I plan to merge my own -rc pull requests after rc2 into > >> my for-next branch, so you won't be missing code that goes into later > >> rcs if you base your work on my for-next branch, so that's a second > >> alternative starting point for your shared pull requests should you > >> need it. > > > > From our experience, it is not feasible to demand shared pull > > requests on "newer than an rc2 kernel". > > I said "nothing newer than an rc2 kernel". Did you mean to leave out > the nothing? Most probably I translated it incorrectly. I wanted to say that all shared pull requests will be -rc2, -rc3, e.t.c. and probably will never be -rc1. Did you mean the same? > > > The magic of shared pull request > > is in the fact that it is based on the same origin for both trees. > > Correct. So, for instance, I'm opening up my for-next area today and it > will be based on a clean v4.14-rc2. What I'm then asking for is that > subsequent driver shared pull requests be based on a v4.14-rc2 tree. > Your last shared pull request was mostly OK, but it was based on a > v4.13-rc4 kernel and so it would have simultaneously brought in your > patches and also all the changes between 4.13-rc2 and 4.13-rc4. Why is it "undesired behavior"? Anyhow git request-pull to Linus will filter all patches which already exist in Linus's tree and you will get merge of -rc fixes for free in your for-next. > > > In our case the same origin is Linus's tree and his official -rcX, which > > for sure will be in both trees. > > Right, that what I want. > > > Once shared pull request is based on that tree, it will apply cleanly > > on both netdev and RDMA without pollution of the trees. > > > > And again, shared pull request shouldn't be based on any patches > > accepted to netdev and/or RDMA which are not in Linus's tree. > > Exactly. > > > -- > Doug Ledford <dledford@xxxxxxxxxx> > GPG Key ID: B826A3330E572FDD > Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD >
Attachment:
signature.asc
Description: PGP signature
