On Wed, 3 Oct 2018 14:14:28 +0200 Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx> wrote: > HI Dominique, > > On Wed, Oct 3, 2018 at 12:37 AM Dominique Martinet > <asmadeus@xxxxxxxxxxxxx> wrote: > > > > Miguel Ojeda wrote on Wed, Oct 03, 2018: > > > As I have read, -next is supposed to be a vision of what the merge > > > window will look like after merging everything, i.e. ideally -rc1. For > > > that to work for files out-of-tree (like these ones, which are not > > > maintained by a single tree), changes should be allowed to be stacked > > > on each other; otherwise, we cannot handle conflicts :-( > > > > The rule is the same as with a regular mainline pull; I don't have the > > reference at hand but in some recent-ish pull request Linus said he > > That is actually the first problem: there is no > reference/documentation at hand. :-P > Yes, and one of the topics for Maintainers Summit is to create one. One is actually in the works led by Dan Williams. -- Steve
