Conflicting commits for seaboard USB keyboard handling

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).

Tom, can you look into it (and involve whoever is needed) and provide a pull request with a fix, the same way I asked Stefano and Minkyu for the same?

Thanks in advance!

Amicalement,
--
Albert.

Will do.

Quoted 6 lines · Albert ARIBAUD

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).

Quoted 10 lines

Tom, can you look into it (and involve whoever is needed) and provide a pull request with a fix, the same way I asked Stefano and Minkyu for the same?

Thanks in advance!

Amicalement,
--
Albert.

Albert,

Quoted 10 lines · Tom Warren

Will do.

Quoted 6 lines · Albert ARIBAUD

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).

Looking at Allen's commit, it only added CONFIG_USB_KEYBOARD (plus a comment) to seaboard.h. That should be conflict-free with my rename of TEGRA20_ to TEGRA_ in seaboard.h. Looking at Allen's patchset (which is marked 'Awaiting upstream' in Patchwork, BTW), you can see that my patch had already been applied to Allen's source (CONFIG_TEGRA_KEYBOARD instead of CONFIG_TEGRA20_KEYBOARD precedes Allen's CONFIG_USB_KEYBOARD in seaboard.h).

I pulled TOT u-boot/master, and both commits seem to be just fine for seaboard.h. It builds fine, too.

Can you be more explicit about the exact conflict, including which exact repos & branches you are merging when you see the conflict?

Quoted 22 lines · Tom Warren

Albert,

Quoted 10 lines · Tom Warren

Will do.

Quoted 6 lines · Albert ARIBAUD

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).

Looking at Allen's commit, it only added CONFIG_USB_KEYBOARD (plus a comment) to seaboard.h. That should be conflict-free with my rename of TEGRA20_ to TEGRA_ in seaboard.h. Looking at Allen's patchset (which is marked 'Awaiting upstream' in Patchwork, BTW), you can see that my patch had already been applied to Allen's source (CONFIG_TEGRA_KEYBOARD instead of CONFIG_TEGRA20_KEYBOARD precedes Allen's CONFIG_USB_KEYBOARD in seaboard.h).

Quoted 5 lines

I pulled TOT u-boot/master, and both commits seem to be just fine for seaboard.h. It builds fine, too.

Can you be more explicit about the exact conflict, including which exact repos & branches you are merging when you see the conflict?

I can see the conflict if I checkout u-boot-arm/master and then merge u-boot-tegra/next and u-boot/master. If we pull the following commit from u-boot/master into u-boot-tegra/next it helps:

5ddcc38 tegra: Enable USB keyboard

There's still a conflict between the LCD config file changes and the USB keyboard config file changes, but it's pretty straightforward to resolve.

-Allen
--
nvpublic

Quoted 6 lines · Albert ARIBAUD

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).

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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?

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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.

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.

Tom

Quoted 57 lines · Albert ARIBAUD

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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.

Quoted 6 lines · Tom Warren

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?

-Allen

Quoted 61 lines

Tom

Quoted 57 lines · Albert ARIBAUD

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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

Allen,

Quoted 11 lines · Allen Martin

Quoted 6 lines · Tom Warren

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?

Tom

Quoted 67 lines

-Allen

Quoted 61 lines

Tom

Quoted 57 lines · Albert ARIBAUD

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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

Quoted 15 lines · Tom Warren

Allen,

Quoted 11 lines · Allen Martin

Quoted 6 lines · Tom Warren

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?

Quoted 6 lines

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

Quoted 70 lines

Tom

Quoted 67 lines

-Allen

Quoted 61 lines

Tom

Quoted 57 lines · Albert ARIBAUD

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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

Allen,

Quoted 31 lines · Allen Martin

Quoted 15 lines · Tom Warren

Allen,

Quoted 11 lines · Allen Martin

Quoted 6 lines · Tom Warren

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?

Quoted 6 lines

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)

Quoted 1 line

-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 ????.

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

Quoted 73 lines

Quoted 70 lines

Tom

Quoted 67 lines

-Allen

Quoted 61 lines

Tom

Quoted 57 lines · Albert ARIBAUD

Hi Allen,

Quoted 38 lines · Allen Martin

Quoted 20 lines · Tom Warren

Albert,

Quoted 8 lines

Quoted 6 lines · Albert ARIBAUD

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.

Quoted 9 lines

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.

Quoted 6 lines

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

The other alternative is I could provide the conflict resolved files or instructions for how to resolve.

On 12/18/2012 06:08 PM, Allen Martin wrote:
...

Quoted 2 lines

The other alternative is I could provide the conflict resolved files or instructions for how to resolve.

Aren't the two sets of files that conflict those that are already in u-boot/master and u-boot-arm/master? If so, only Albert can resolve the conflict, by doing a merge. I already did that merge locally a while back in order to pick up the changes from both branches, and it didn't seem hard; what's the problem here? If Allen can push out a branch for Albert to use as an example to make sure he gets the correct merge result, that seems like a very simple solution.

Hi Stephen,

Quoted 5 lines · Stephen Warren

On 12/18/2012 06:08 PM, Allen Martin wrote:
...

Quoted 2 lines

The other alternative is I could provide the conflict resolved files or instructions for how to resolve.

Quoted 7 lines

Aren't the two sets of files that conflict those that are already in u-boot/master and u-boot-arm/master? If so, only Albert can resolve the conflict, by doing a merge. I already did that merge locally a while back in order to pick up the changes from both branches, and it didn't seem hard; what's the problem here? If Allen can push out a branch for Albert to use as an example to make sure he gets the correct merge result, that seems like a very simple solution.

There are several sources of conflicts in merging u-boot into u-boot-arm. I want all conflicts resolved by the persons who are best suited for resolving properly, then I'll merge all resolutions together.

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.

-Allen

Signature · 1 line

nvpublic

Hi Allen,

Quoted 14 lines

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.

Quoted 3 lines

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.

Quoted 16 lines · Albert ARIBAUD

Hi Allen,

Quoted 14 lines

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.

Quoted 7 lines

Quoted 3 lines

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

u-boot-arm/master and u-boot-tegra/next should have the same base commit (b8a7c46), so merging them isn't a big deal, and goes smoothly for me. If I then take u-boot/master and merge it, I see a conflict in drivers/power/power_fls.c and include/configs/mx35pdk.h and mx53loco.h, but no problems with Tegra code. I could resolve those conflicts and continue with the rebase, but ...

Correct me if I'm wrong, but u-boot-tegra and u-boot-usb are both pulled into u-boot-arm, and (I thought) u-boot-arm is then (or eventually) pulled into u-boot/master. I don't pull from u-boot-usb (or any other 'sub' repo), since that would appear to create conflicts when Albert pulls into u-boot-arm. I also don't pull from u-boot/master, since it's essentially 2 levels above me.

Albert - if you can, please show me exactly what fetch/merge or rebase command sequence is failing for you. I'm still not clear on what the exact merge conflict error is, nor how to fix it. Or Allen, if you have better visibility into exactly what the merge conflict is w/Tegra that I'm just not seeing, maybe you could provide either a patchset that'll fix it or steps I can take to do the same.

Hi Tom,

Quoted 14 lines · Tom Warren

u-boot-arm/master and u-boot-tegra/next should have the same base commit (b8a7c46), so merging them isn't a big deal, and goes smoothly for me. If I then take u-boot/master and merge it, I see a conflict in drivers/power/power_fls.c and include/configs/mx35pdk.h and mx53loco.h, but no problems with Tegra code. I could resolve those conflicts and continue with the rebase, but ...

Correct me if I'm wrong, but u-boot-tegra and u-boot-usb are both pulled into u-boot-arm, and (I thought) u-boot-arm is then (or eventually) pulled into u-boot/master. I don't pull from u-boot-usb (or any other 'sub' repo), since that would appear to create conflicts when Albert pulls into u-boot-arm. I also don't pull from u-boot/master, since it's essentially 2 levels above me.

Quoted 6 lines

Albert - if you can, please show me exactly what fetch/merge or rebase command sequence is failing for you. I'm still not clear on what the exact merge conflict error is, nor how to fix it. Or Allen, if you have better visibility into exactly what the merge conflict is w/Tegra that I'm just not seeing, maybe you could provide either a patchset that'll fix it or steps I can take to do the same.

As for what I did, it was simply to try and merge u-boot-tegra into u-boot-arm.

Regarding u-boot-usb, it is not usually pulled into u-boot-arm; but if it was needed by, and pulled into, u-boot-tegra, then it would have automatically been pulled into u-boot-arm when I fetched u-boot-tegra, and merged when I did the merge. Would it not?

Amicalement,
--
Albert.