From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Westerberg Subject: Re: [PATCH v2 3/3] pinctrl / gpio: Introduce .set_config() callback for GPIO chips Date: Tue, 24 Jan 2017 16:22:20 +0200 Message-ID: <20170124142220.GK17297@lahna.fi.intel.com> References: <20170123123434.61972-1-mika.westerberg@linux.intel.com> <20170123123434.61972-4-mika.westerberg@linux.intel.com> <20170123171107.GC32404@localhost> <20170124111130.GE17297@lahna.fi.intel.com> <20170124125756.GG17297@lahna.fi.intel.com> <20170124134504.GA20261@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga04.intel.com ([192.55.52.120]:6210 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750827AbdAXOW0 (ORCPT ); Tue, 24 Jan 2017 09:22:26 -0500 Content-Disposition: inline In-Reply-To: <20170124134504.GA20261@localhost> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Johan Hovold Cc: Linus Walleij , Alexandre Courbot , Andy Shevchenko , Neil Armstrong , "linux-gpio@vger.kernel.org" , "linux-kernel@vger.kernel.org" On Tue, Jan 24, 2017 at 02:45:04PM +0100, Johan Hovold wrote: > Good, that's the one I knew about. But I also got another conflict > against pinctrl when applying on top of f9dd6f6cc63c ("Add linux-next > specific files for 20170123"): > > Applying: pinctrl / gpio: Introduce .set_config() callback for GPIO chips > error: patch failed: drivers/pinctrl/pinctrl-amd.c:756 > error: drivers/pinctrl/pinctrl-amd.c: patch does not apply > error: patch failed: drivers/staging/greybus/gpio.c:474 > error: drivers/staging/greybus/gpio.c: patch does not apply > Patch failed at 0001 pinctrl / gpio: Introduce .set_config() callback for GPIO chips I tried today's linux-next 766074e7818 ("Add linux-next specific files for 20170124") but only saw that GPIO conflict. In any case I'm going to rebase my series on top of linux-gpio.git/devel and submit it as v3.