From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934098AbcI0TRG (ORCPT ); Tue, 27 Sep 2016 15:17:06 -0400 Received: from muru.com ([72.249.23.125]:43195 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbcI0TQ6 (ORCPT ); Tue, 27 Sep 2016 15:16:58 -0400 Date: Tue, 27 Sep 2016 12:16:54 -0700 From: Tony Lindgren To: Stephen Rothwell Cc: Linus Walleij , Olof Johansson , Arnd Bergmann , ARM , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc tree Message-ID: <20160927191653.57ig7mh3ptjy3izi@atomide.com> References: <20160927150542.7e81e7ee@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160927150542.7e81e7ee@canb.auug.org.au> User-Agent: Mutt/1.6.2-neo (2016-07-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell [160926 22:06]: > Hi Linus, > > 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. Yes thanks removing it the way to go. Regards, Tony