[Ksummit-discuss] Maintainer's Summit Agenda Planning
broonie at sirena.org.uk
Mon Oct 16 18:52:18 UTC 2017
On Mon, Oct 16, 2017 at 07:12:55AM -0700, James Bottomley wrote:
> On Wed, 2017-10-11 at 21:51 +0300, Jani Nikula wrote:
> > By -rc1 we (drm in general, drm/i915 in particular) will already have
> > accumulated easily 4-5 weeks' worth of commits for the *next* merge
> > window. Applying treewide stuff to Linus' tree at -rc1 forces a
> > backmerge and potentially conflicts galore
> If we're applying a semantic patch script (and we've verified it works
> well enough to use the script on the -rc1 main tree), couldn't you
> simply apply it to your tree at the same time?
git doesn't do the best job figuring out that the same change was made
in two different commits so you still end up with the conflicts. It's
much easier if we can just get changes in through the maintainer tree.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 488 bytes
Desc: not available
More information about the Ksummit-discuss