From mboxrd@z Thu Jan 1 00:00:00 1970 From: Allen Martin Date: Tue, 18 Dec 2012 17:08:07 -0800 Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling In-Reply-To: References: <20121210192504.GA25496@badger> <20121211190209.GB25496@badger> <20121215174108.7d2cd36f@lilith> <20121217222251.GA11959@badger> <20121218180614.GA15608@badger> Message-ID: <20121219010807.GB15608@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 Tue, Dec 18, 2012 at 03:59:36PM -0800, Tom Warren wrote: > Allen, > > On Tue, Dec 18, 2012 at 11:06 AM, Allen Martin wrote: > > On Tue, Dec 18, 2012 at 08:43:18AM -0800, Tom Warren wrote: > >> Allen, > >> > >> On Mon, Dec 17, 2012 at 3:22 PM, Allen Martin wrote: > >> > On Mon, Dec 17, 2012 at 02:13:29PM -0800, Tom Warren wrote: > >> >> Allen, > >> >> > >> >> If you come up with patches to fix the seaboard config files, I can > >> >> add them to my copy of u-boot-tegra/master, push it to denx, and > >> >> generate a pull request for Albert if you want. > >> >> > >> > > >> > The conflicting changes have already been merged to u-boot-arm/master, > >> > Albert were you planning to replay the merge of the already merged > >> > tegra patches? > >> > >> Sorry, but I don't see any new merges since the FETCH_HEAD I listed > >> below, i.e. u-boot-arm/master still appears to be @ b8a7c46 for me > >> (git pull in u-boot-arm repo, and git fetch > >> git://git.denx.de/u-boot-arm master in my tegra repo). > >> > >> What am I missing? > > > > The conflict happened prior to that point. In particular this is the > > first conflicting patch: > > > > 4576c6e tegra: Enable display/lcd support on Seaboard > > > > (and then all the patches that touch tegra config files after that > > which need to be rebased) > > > > -Allen > > OK, sorry, I mistook the 'conflicting changes have already been > merged' to mean that you've fixed the conflicts and Albert had merged > them. > > Where are we on getting a set of patches that fix the conflicts into > either u-boot-tegra, u-boot-arm, or ????. Whatever the fix is, it will need to go in before: 4576c6e tegra: Enable display/lcd support on Seaboard or I can amend that change to resolve the conflict. Either way will require replaying the tegra patches that were already merged into u-boot-arm. Albert, is that what you want to do? The other alternative is I could provide the conflict resolved files or instructions for how to resolve. Albert's suggestion of providing a new pull request won't help as the conflicting changes are already in the u-boot-arm tree. -Allen > > I'm sitting on a new pull request for some Tegra20 tweaks and the > baseline Tegra30 support patches that I'd like to get in sooner than > later. > > Thanks, > > Tom > > > >> > >> Tom > >> > > >> > -Allen > >> > > >> >> Tom > >> >> > >> >> On Sat, Dec 15, 2012 at 9:41 AM, Albert ARIBAUD > >> >> wrote: > >> >> > Hi Allen, > >> >> > > >> >> > On Tue, 11 Dec 2012 11:02:09 -0800, Allen Martin > >> >> > wrote: > >> >> >> On Mon, Dec 10, 2012 at 01:51:40PM -0800, Tom Warren wrote: > >> >> >> > Albert, > >> >> >> > > >> >> >> > > On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD > >> >> >> > > wrote: > >> >> >> > >> Hello, > >> >> >> > >> > >> >> >> > >> It seems like two commits 5ddcc38b (in u-boot, committed by Marek) > >> >> >> > >> 29f3e3f2 (in u-boot-arm, committed by Tom from u-boot-tegra) are > >> >> >> > >> conflicting on the seaboard configuration header file for USB (and > >> >> >> > >> possibly other areas). > >> >> >> > > >> >> >> > One possible problem is that I've got new commits ready in > >> >> >> > u-boot-tegra/next that were almost ready for a pull request, so I > >> >> >> > copied them over to my tegra/master branch and pushed to > >> >> >> > u-boot-tegra/master on denx. I assumed that once I got the 'applied > >> >> >> > to u-boot-arm/master' response from you, that I could stage the next > >> >> >> > pull request. But if you (or Allen) are pulling from > >> >> >> > u-boot-tegra/master )or /next), you're gonna get commits that haven't > >> >> >> > been merged into u-boot-arm/master. > >> >> >> > > >> >> >> > I can push the older tegra/master branch back to denx.de (the one that > >> >> >> > I requested a pull from on Nov 19th) if that'll help. But I'm not > >> >> >> > sure how it would help, since all those commits should have been > >> >> >> > present in u-boot-arm/master (from my pull request) when you went to > >> >> >> > merge w/u-boot/master. > >> >> >> > > >> >> >> > So I'm still not seeing how the conflict arose, or what the path is to > >> >> >> > fixing it. > >> >> >> > > >> >> >> > >> >> >> The conflict came from my config file changes for tegra USB keyboard > >> >> >> which went up to u-boot/master through Marek's tree becasue they > >> >> >> depend on my USB DMA alignment fix which was not a tegra change. > >> >> >> There are subsequent changes in both the tegra and arm trees that were > >> >> >> not based on that change, so they now conflict when attempting to > >> >> >> merge back into u-boot/master. > >> >> >> > >> >> >> It's trivial for me to resolve the conflict since I have context on > >> >> >> the changes. I see that there are other merge conflicts between > >> >> >> u-boot/master and u-boot-arm/master though, so I'm not sure how to > >> >> >> proceed. Albert do you just want me to post merged versions of the > >> >> >> two files that conflict, so you know how to resolve the conflict > >> >> >> during your merge? > >> >> > > >> >> > I would like you to post a pull request that would fix the two file > >> >> > conflicts; I have asked other people to fix other merge conflicts. I > >> >> > will merge all fix branches in one go (so that u-boot-arm keeps > >> >> > building clean) once all fix branches are available. > >> >> > > >> >> > Amicalement, > >> >> > -- > >> >> > Albert. > >> > > >> > -- > >> > nvpublic > > > > -- > > nvpublic -- nvpublic