Re: [PATCH v3] Add a document on rebasing and merging

2019-06-24 Thread Dmitry Vyukov
On Fri, Jun 14, 2019 at 4:25 PM Jonathan Corbet wrote: > > On Fri, 14 Jun 2019 11:59:03 +0200 > Dmitry Vyukov wrote: > > > I will appreciate if you elaborate a bit on this "scale of the > > project". I wondered about reasons for having the current hierarchy of > > trees and complex merging for a

Re: [PATCH v3] Add a document on rebasing and merging

2019-06-14 Thread Jonathan Corbet
On Fri, 14 Jun 2019 11:59:03 +0200 Dmitry Vyukov wrote: > I will appreciate if you elaborate a bit on this "scale of the > project". I wondered about reasons for having the current hierarchy of > trees and complex merging for a while, but wasn't able to find any > rationale. What exactly scale do

Re: [PATCH v3] Add a document on rebasing and merging

2019-06-14 Thread Dmitry Vyukov
On Wed, Jun 12, 2019 at 5:45 PM Jonathan Corbet wrote: > > Every merge window seems to involve at least one episode where subsystem > maintainers don't manage their trees as Linus would like. Document the > expectations so that at least he has something to point people to. > > Acked-by: David Rie

[PATCH v3] Add a document on rebasing and merging

2019-06-12 Thread Jonathan Corbet
Every merge window seems to involve at least one episode where subsystem maintainers don't manage their trees as Linus would like. Document the expectations so that at least he has something to point people to. Acked-by: David Rientjes Signed-off-by: Jonathan Corbet --- I intend to apply this v