From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751039AbdA3RDT (ORCPT ); Mon, 30 Jan 2017 12:03:19 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34989 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbdA3RDS (ORCPT ); Mon, 30 Jan 2017 12:03:18 -0500 X-ME-Sender: X-Sasl-enc: FrXqqjbc9x9UUbg2YKEplc+rdaA+w/r1PXzeuL5k+hiw 1485795796 Date: Mon, 30 Jan 2017 18:02:45 +0100 From: Greg KH To: Stephen Rothwell Cc: Linus Walleij , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Roman Sommer , Mika Westerberg Subject: Re: linux-next: manual merge of the gpio tree with the staging tree Message-ID: <20170130170245.GB13895@kroah.com> References: <20170130152855.7e8cb6c2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170130152855.7e8cb6c2@canb.auug.org.au> User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 30, 2017 at 03:28:55PM +1100, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/staging/greybus/gpio.c > > between commit: > > 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings") > > from the staging tree and commit: > > 2956b5d94a76 ("pinctrl / gpio: Introduce .set_config() callback for GPIO chips") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/staging/greybus/gpio.c > index 558550cfe687,51384bdde450..000000000000 > --- a/drivers/staging/greybus/gpio.c > +++ b/drivers/staging/greybus/gpio.c > @@@ -474,17 -474,20 +474,20 @@@ static void gb_gpio_set(struct gpio_chi > gb_gpio_set_value_operation(ggc, (u8)offset, !!value); > } > > - static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned int offset, > - unsigned int debounce) > -static int gb_gpio_set_config(struct gpio_chip *chip, unsigned offset, > ++static int gb_gpio_set_config(struct gpio_chip *chip, unsigned int offset, > + unsigned long config) > { > struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip); > - u16 usec; > + u32 debounce; > > + if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE) > + return -ENOTSUPP; > + > + debounce = pinconf_to_config_argument(config); > if (debounce > U16_MAX) > return -EINVAL; > - usec = (u16)debounce; > > - return gb_gpio_set_debounce_operation(ggc, (u8)offset, usec); > + return gb_gpio_set_debounce_operation(ggc, (u8)offset, (u16)debounce); > } > > static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc) Looks good, thanks for this. greg k-h