From mboxrd@z Thu Jan 1 00:00:00 1970 From: Allen Martin Date: Wed, 19 Dec 2012 16:32:08 -0800 Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling In-Reply-To: <20121219234224.75bed961@lilith> References: <20121217222251.GA11959@badger> <20121218180614.GA15608@badger> <20121219010807.GB15608@badger> <50D158D9.7070209@wwwdotorg.org> <20121219203726.0163f85e@lilith> <20121219211137.GC15608@badger> <20121219234224.75bed961@lilith> Message-ID: <20121220003208.GD15608@badger> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Dec 19, 2012 at 02:42:24PM -0800, Albert ARIBAUD wrote: > Hi Allen, > > > Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and > > resolved the conflicts and I've pushed the result to: > > > > git://github.com/arm000/u-boot.git > > branch: u-boot-arm-merge-resolved > > > > I resolved all the conflicts, but the only ones I claim I did > > correctly were the changes to: > > > > include/configs/seaboard.h > > include/configs/tegra-common-post.h > > > > the other conflicts were not related to tegra. > > > > If you want a new pull request, you'll first have to unroll the > > previously merged tegra patches from u-boot-arm/master so I can give > > you a conflict free merge request. > > Thanks Allen, this branch is what I wanted exactly -- I don't want to > ask for a rollback. As soon as I am sure about the samsung branch, I'll > merge all "fix" branches into ARM. Ok, let me know if you have any problems resolving and I'll try to help the best I can. Tom, you'll need to rebase u-boot-tegra/next on top of this, and there will be conflicts when you do. I've resolved those as well for reference and pushed to: git://github.com/arm000/u-boot.git branch: u-boot-tegra-next-rebased -Allen -- nvpublic