On Mon, Mar 20, 2017 at 9:03 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > On Mon, Mar 20, 2017 at 1:51 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >> This cherry picking of fixes from new development back to Linus' tree >> can be a real pain when so many other changes happen in the same files. > > One possible fix for this would be if you reuse our rerere cache. The > only reason we don't go insane with all the drm conflicts is that we > completely distributed conflict resolution. Developers push a patch, > script tells them there's a conflict, they resolve it, maintainers > never even notice.We only notice when we double-check the merge > resolution when rerere re-applies it for the real backmerge :-) The > merge order in drm-tip should also match what you have in linux-next, > so you should be able to entirely reuse them. > > Anyway, if you trust us enough to scoop up random git rerere caches > (or at least use them to double-check your own), they're all public: > > git://anongit.freedesktop.org/drm-tip rerere-cache > > Or > > https://cgit.freedesktop.org/drm-tip/tree/rr-cache?h=rerere-cache > > Yes we should probably gc them, but disk space is cheap. And the merge order, in case you want to check that. We can adjust it ofc: https://cgit.freedesktop.org/drm-tip/tree/nightly.conf?h=rerere-cache Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
