From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754696AbcIOVSO (ORCPT ); Thu, 15 Sep 2016 17:18:14 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34466 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbcIOVSE (ORCPT ); Thu, 15 Sep 2016 17:18:04 -0400 From: Kevin Hilman To: Linus Walleij Cc: Stephen Rothwell , Carlo Caione , "linux-next\@vger.kernel.org" , "linux-kernel\@vger.kernel.org" , Deepak Subject: Re: linux-next: manual merge of the amlogic tree with the pinctrl tree Organization: BayLibre References: <20160915101908.08f24fe1@canb.auug.org.au> Date: Thu, 15 Sep 2016 14:18:01 -0700 In-Reply-To: (Linus Walleij's message of "Thu, 15 Sep 2016 14:22:40 +0200") Message-ID: <7h60pwlv5i.fsf@baylibre.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Walleij writes: > On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell wrote: > >> 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. > > That should not be in the amlogic tree. > > Carlo, Deepak etc: Please make sure it goes away from there. It in the amlogic tree because I merged your pinctrl/devel into my integration branch for testing, but appears the one I merged was out-dated. Fixed. Kevin