From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932277AbcJFGwD (ORCPT ); Thu, 6 Oct 2016 02:52:03 -0400 Received: from mail-oi0-f45.google.com ([209.85.218.45]:35273 "EHLO mail-oi0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752099AbcJFGwC (ORCPT ); Thu, 6 Oct 2016 02:52:02 -0400 MIME-Version: 1.0 In-Reply-To: <20161006094114.764d2f34@canb.auug.org.au> References: <20160927150542.7e81e7ee@canb.auug.org.au> <20161006094114.764d2f34@canb.auug.org.au> From: Linus Walleij Date: Thu, 6 Oct 2016 08:52:00 +0200 Message-ID: Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc tree To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , ARM , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Tony Lindgren 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 Thu, Oct 6, 2016 at 12:41 AM, Stephen Rothwell wrote: > On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell wrote: >> >> Today's linux-next merge of the gpio tree got a conflict in: >> >> arch/arm/mach-omap2/board-rx51-peripherals.c >> >> between commit: >> >> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900") >> >> from the arm-soc tree and commit: >> >> 9132ce450bd1 ("ARM: omap2: fix missing include") >> >> from the gpio tree. >> >> I fixed it up (the former removed the file, so I did that) 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. > > Since Linus (Torvalds) has merged the gpio tree, this conflict (and > file removal) now affects the merge of the arm-soc tree). Yup and I also informed him in my pull request about this conflict so shouldn't be a problem. Yours, Linus Walleij From mboxrd@z Thu Jan 1 00:00:00 1970 From: linus.walleij@linaro.org (Linus Walleij) Date: Thu, 6 Oct 2016 08:52:00 +0200 Subject: linux-next: manual merge of the gpio tree with the arm-soc tree In-Reply-To: <20161006094114.764d2f34@canb.auug.org.au> References: <20160927150542.7e81e7ee@canb.auug.org.au> <20161006094114.764d2f34@canb.auug.org.au> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Oct 6, 2016 at 12:41 AM, Stephen Rothwell wrote: > On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell wrote: >> >> Today's linux-next merge of the gpio tree got a conflict in: >> >> arch/arm/mach-omap2/board-rx51-peripherals.c >> >> between commit: >> >> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900") >> >> from the arm-soc tree and commit: >> >> 9132ce450bd1 ("ARM: omap2: fix missing include") >> >> from the gpio tree. >> >> I fixed it up (the former removed the file, so I did that) 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. > > Since Linus (Torvalds) has merged the gpio tree, this conflict (and > file removal) now affects the merge of the arm-soc tree). Yup and I also informed him in my pull request about this conflict so shouldn't be a problem. Yours, Linus Walleij