From: Tom Rini Date: Mon, 11 Mar 2013 16:03:08 -0400 Subject: [U-Boot] Conflict between mainline and ARM trees on davinci In-Reply-To: <20130311103821.206f8faf@lilith> References: <20130311103821.206f8faf@lilith> Message-ID: <20130311200308.GC23324@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, Mar 11, 2013 at 10:38:21AM +0100, Albert ARIBAUD wrote: > Hello, > > There is merge conflict between mainline and ARM trees on davinci gpio, > between > > commit 03414ac45e119496e2475aeacbb968bb67da24f8 > gpio: Build the da8xx_gpio code for the davinci644x device > (mainline) > > and > > commit b9f56698c7e9bf7ac773b5346c4f6886e214b69b > da8xx: Add the missing pinmux for da830 to the gpio driver > (ARM, from TI tree) > > Authors CC:ed, as well as Tom for both TI and mainline tree. > > Tom, how do you want to reconcile things? > > Manual resolution in the merge commit was frowned upon last time I did > it, because it introduces non-reviewed code changes. > > This leaves doing a manual commit on either one of the mainline, ARM or > TI trees so that merge becomes trivial. Mainline tree is preferable I > think, because it avoids added PR. This is addressed with the next u-boot-ti/master pull request where I included the conflict resolution commit. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: