From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693Ab3KSNSd (ORCPT ); Tue, 19 Nov 2013 08:18:33 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:60088 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752495Ab3KSNSb (ORCPT ); Tue, 19 Nov 2013 08:18:31 -0500 From: "Rafael J. Wysocki" To: Linus Walleij , Stephen Rothwell Cc: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Alexandre Courbot , "Rafael J. Wysocki" Subject: Re: linux-next: manual merge of the gpio tree with the pm tree Date: Tue, 19 Nov 2013 14:31:08 +0100 Message-ID: <4205130.mhhgmhmNgO@vostro.rjw.lan> User-Agent: KMail/4.10.5 (Linux/3.12.0-rc6+; KDE/4.10.5; x86_64; ; ) In-Reply-To: References: <20131119124357.a6191743b0f568d40c8291d5@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday, November 19, 2013 08:52:13 AM Linus Walleij wrote: > On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell wrote: > > > Today's linux-next merge of the gpio tree got a conflict in > > drivers/gpio/gpiolib.c between commit 7b1998116bbb ("ACPI / driver core: > > Store an ACPI device pointer in struct acpi_dev_node") from the pm tree > > and commit f760f1967ee8 ("gpiolib: use dedicated flags for GPIO > > properties") from the gpio tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Oh I never saw that patch before ... Well, sorry about that ... > anyway it seems to be correct, thanks. Yes, it looks correct to me too. Thanks for fixing this up Stephen! Rafael