From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754109AbdCTK6w (ORCPT ); Mon, 20 Mar 2017 06:58:52 -0400 Received: from mga06.intel.com ([134.134.136.31]:47806 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753688AbdCTK5o (ORCPT ); Mon, 20 Mar 2017 06:57:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,193,1486454400"; d="scan'208";a="946176619" Message-ID: <1490007279.19767.93.camel@linux.intel.com> Subject: Re: linux-next: manual merge of the gpio tree with the input tree From: Andy Shevchenko To: Stephen Rothwell , Linus Walleij , Dmitry Torokhov Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hans de Goede Date: Mon, 20 Mar 2017 12:54:39 +0200 In-Reply-To: <20170320150340.6d73c179@canb.auug.org.au> References: <20170320150340.6d73c179@canb.auug.org.au> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.5-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-03-20 at 15:03 +1100, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > >   drivers/input/misc/soc_button_array.c > > between commit: > >   a01cd17000a4 ("Input: soc_button_array - use NULL for GPIO > connection ID") > > from the input tree and commit: > >   c5097538c86a ("Input: soc_button_array - Propagate error from > gpiod_count()") > > from the gpio tree. > > I fixed it up (see below) 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. The fix is correct. Thank you, Stephen. -- Andy Shevchenko Intel Finland Oy