Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753182AbdCTIFO (ORCPT ); Mon, 20 Mar 2017 04:05:14 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:34499 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752883AbdCTIFL (ORCPT ); Mon, 20 Mar 2017 04:05:11 -0400 MIME-Version: 1.0 X-Originating-IP: [2a02:168:56c9:0:decc:6e78:7e96:b452] In-Reply-To: References: <20170320115128.0bc3861b@canb.auug.org.au> From: Daniel Vetter Date: Mon, 20 Mar 2017 09:05:09 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the drm tree To: Stephen Rothwell Cc: Dave Airlie , Intel Graphics , DRI , linux-next , Linux Kernel Mailing List , Chris Wilson , Jani Nikula Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1448 Lines: 34 On Mon, Mar 20, 2017 at 9:03 AM, Daniel Vetter wrote: > On Mon, Mar 20, 2017 at 1:51 AM, Stephen Rothwell 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