Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752517AbdCHKW5 (ORCPT ); Wed, 8 Mar 2017 05:22:57 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35144 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbdCHKVm (ORCPT ); Wed, 8 Mar 2017 05:21:42 -0500 Date: Wed, 8 Mar 2017 10:49:51 +0100 From: Daniel Vetter To: Jani Nikula Cc: Maxime Ripard , Stephen Rothwell , Daniel Vetter , Intel Graphics , linux-kernel@vger.kernel.org, DRI , Chen-Yu Tsai , linux-next@vger.kernel.org Subject: Re: linux-next: build failure after merge of the sunxi tree Message-ID: <20170308094951.qtvgv4x4bzjtqcoz@phenom.ffwll.local> Mail-Followup-To: Jani Nikula , Maxime Ripard , Stephen Rothwell , Intel Graphics , linux-kernel@vger.kernel.org, DRI , Chen-Yu Tsai , linux-next@vger.kernel.org References: <20170307111019.246a9629@canb.auug.org.au> <20170307213940.kcaedlhiua2r4lsq@lukather> <878togjhrl.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <878togjhrl.fsf@intel.com> X-Operating-System: Linux phenom 4.8.0-1-amd64 User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 652 Lines: 17 On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote: > On Tue, 07 Mar 2017, Maxime Ripard wrote: > > I just rebased my tree on top of the latest drm-misc tag > > (drm-misc-next-2017-03-06). It should compile, and not have merge > > conflicts anymore. > > Conflicts happen. Rebasing should not be the standard operating > procedure for fixing them. I think for this one here it's ok, very early in the feature cycle, few patches, nasty conflict. But yeah the same thing right before the merge window opens wouldn't be cool. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch