From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752189AbcCIFfu (ORCPT ); Wed, 9 Mar 2016 00:35:50 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35529 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbcCIFff (ORCPT ); Wed, 9 Mar 2016 00:35:35 -0500 Date: Wed, 9 Mar 2016 12:35:23 +0700 From: Lee Jones To: Stephen Rothwell Cc: Linus Walleij , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Laxman Dewangan , "Andrew F. Davis" Subject: Re: linux-next: manual merge of the gpio tree with the mfd tree Message-ID: <20160309053523.GN13692@x1> References: <20160309143725.412f97b3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160309143725.412f97b3@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 09 Mar 2016, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/gpio/gpio-tps65912.c > > between commits: > > 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver") > ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC") > > from the mfd tree and commit: > > 0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration") > > from the gpio tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). I sent out a pull-request for this already. Please pull 'ib-mfd-regulator-gpio-4.6' from my tree. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog