From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the gpio tree with the arm-soc tree Date: Tue, 27 Sep 2016 15:05:42 +1000 Message-ID: <20160927150542.7e81e7ee@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:57593 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751314AbcI0FFp (ORCPT ); Tue, 27 Sep 2016 01:05:45 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Walleij , Olof Johansson , Arnd Bergmann , ARM Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren 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. -- Cheers, Stephen Rothwell