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 S1764941AbcIOATM (ORCPT <rfc822;w@1wt.eu>);
        Wed, 14 Sep 2016 20:19:12 -0400
Received: from ozlabs.org ([103.22.144.67]:58978 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1764190AbcIOATL (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 14 Sep 2016 20:19:11 -0400
Date: Thu, 15 Sep 2016 10:19:08 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kevin Hilman <khilman@baylibre.com>, Carlo Caione <carlo@caione.org>,
        Linus Walleij <linus.walleij@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Deepak <deepak_das@mentor.com>
Subject: linux-next: manual merge of the amlogic tree with the pinctrl tree
Message-ID: <20160915101908.08f24fe1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

Today's linux-next merge of the amlogic tree got a conflict in:

  drivers/base/pinctrl.c

between commit:

  23b4ed268076 ("driver: base: pinctrl: return error from pinctrl_bind_pins()")

from the pinctrl tree and commit:

  eb4ec68acf5e ("driver: base: pinctrl: return error from pinctrl_bind_pins()")

from the amlogic tree.

I fixed it up (I used the version from the pinctrl tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell