From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: linux-next: build failure after merge of the sunxi
	tree
Date: Wed, 08 Mar 2017 10:26:54 +0200
Message-ID: <878togjhrl.fsf@intel.com>
References: <20170307111019.246a9629@canb.auug.org.au>
 <20170307213940.kcaedlhiua2r4lsq@lukather>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <20170307213940.kcaedlhiua2r4lsq@lukather>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Maxime Ripard <maxime.ripard@free-electrons.com>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, linux-kernel@vger.kernel.org, DRI <dri-devel@lists.freedesktop.org>, Chen-Yu Tsai <wens@csie.org>, linux-next@vger.kernel.org
List-Id: linux-next.vger.kernel.org

T24gVHVlLCAwNyBNYXIgMjAxNywgTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBmcmVlLWVs
ZWN0cm9ucy5jb20+IHdyb3RlOgo+IEkganVzdCByZWJhc2VkIG15IHRyZWUgb24gdG9wIG9mIHRo
ZSBsYXRlc3QgZHJtLW1pc2MgdGFnCj4gKGRybS1taXNjLW5leHQtMjAxNy0wMy0wNikuIEl0IHNo
b3VsZCBjb21waWxlLCBhbmQgbm90IGhhdmUgbWVyZ2UKPiBjb25mbGljdHMgYW55bW9yZS4KCkNv
bmZsaWN0cyBoYXBwZW4uIFJlYmFzaW5nIHNob3VsZCBub3QgYmUgdGhlIHN0YW5kYXJkIG9wZXJh
dGluZwpwcm9jZWR1cmUgZm9yIGZpeGluZyB0aGVtLgoKQlIsCkphbmkuCgotLSAKSmFuaSBOaWt1
bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50
ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751922AbdCHI2u (ORCPT <rfc822;w@1wt.eu>);
        Wed, 8 Mar 2017 03:28:50 -0500
Received: from mga02.intel.com ([134.134.136.20]:15102 "EHLO mga02.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750729AbdCHI1S (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 8 Mar 2017 03:27:18 -0500
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.36,262,1486454400"; 
   d="scan'208";a="832231767"
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        linux-kernel@vger.kernel.org, DRI <dri-devel@lists.freedesktop.org>,
        Chen-Yu Tsai <wens@csie.org>, linux-next@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the sunxi tree
In-Reply-To: <20170307213940.kcaedlhiua2r4lsq@lukather>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
References: <20170307111019.246a9629@canb.auug.org.au> <20170307213940.kcaedlhiua2r4lsq@lukather>
Date: Wed, 08 Mar 2017 10:26:54 +0200
Message-ID: <878togjhrl.fsf@intel.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> 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.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center