* [U-Boot] Pull request for u-boot-arm -> u-boot?
@ 2014-05-05 16:46 Stephen Warren
2014-05-05 17:46 ` Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Stephen Warren @ 2014-05-05 16:46 UTC (permalink / raw)
To: u-boot
Albert,
I was wondering when the next pull request for u-boot-arm/master ->
u-boot/master was likely to be?
I asked because some changes to the Tegra USB driver went through the
u-boot-tegra/master and hence are now in u-boot-arm/master, but not in
u-boot-usb/master. I have some more USB driver changes which rely on the
earlier USB patches, and these should really go through
u-boot-usb/master rather than the Tegra/ARM tree. For this to happen,
u-boot-usb/master needs to contain the patches currently in
u-boot-arm/master, and the best way for that to happen is for those
patches to get into u-boot/master so that u-boot-usb/master can merge them.
Or, should Marek just merge u-boot-arm/master into his tree directly?
Thanks.
^ permalink raw reply [flat|nested] 12+ messages in thread* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 16:46 [U-Boot] Pull request for u-boot-arm -> u-boot? Stephen Warren @ 2014-05-05 17:46 ` Marek Vasut 2014-05-09 8:39 ` Albert ARIBAUD 2014-05-05 17:46 ` Tom Rini 2014-05-05 17:59 ` Fabio Estevam 2 siblings, 1 reply; 12+ messages in thread From: Marek Vasut @ 2014-05-05 17:46 UTC (permalink / raw) To: u-boot On Monday, May 05, 2014 at 06:46:36 PM, Stephen Warren wrote: > Albert, > > I was wondering when the next pull request for u-boot-arm/master -> > u-boot/master was likely to be? > > I asked because some changes to the Tegra USB driver went through the > u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > u-boot-usb/master. I have some more USB driver changes which rely on the > earlier USB patches, and these should really go through > u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > u-boot-usb/master needs to contain the patches currently in > u-boot-arm/master, and the best way for that to happen is for those > patches to get into u-boot/master so that u-boot-usb/master can merge them. > > Or, should Marek just merge u-boot-arm/master into his tree directly? I will not merge u-boot-arm/master into my tree, no. I will wait for the higher- ups to solve this ... Albert, we're waiting :b Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 17:46 ` Marek Vasut @ 2014-05-09 8:39 ` Albert ARIBAUD 0 siblings, 0 replies; 12+ messages in thread From: Albert ARIBAUD @ 2014-05-09 8:39 UTC (permalink / raw) To: u-boot Hi Marek, On Mon, 5 May 2014 19:46:13 +0200, Marek Vasut <marex@denx.de> wrote: > On Monday, May 05, 2014 at 06:46:36 PM, Stephen Warren wrote: > > Albert, > > > > I was wondering when the next pull request for u-boot-arm/master -> > > u-boot/master was likely to be? > > > > I asked because some changes to the Tegra USB driver went through the > > u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > > u-boot-usb/master. I have some more USB driver changes which rely on the > > earlier USB patches, and these should really go through > > u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > > u-boot-usb/master needs to contain the patches currently in > > u-boot-arm/master, and the best way for that to happen is for those > > patches to get into u-boot/master so that u-boot-usb/master can merge them. > > > > Or, should Marek just merge u-boot-arm/master into his tree directly? > > I will not merge u-boot-arm/master into my tree, no. I will wait for the higher- > ups to solve this ... Albert, we're waiting :b On it now. > Best regards, > Marek Vasut Amicalement, -- Albert. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 16:46 [U-Boot] Pull request for u-boot-arm -> u-boot? Stephen Warren 2014-05-05 17:46 ` Marek Vasut @ 2014-05-05 17:46 ` Tom Rini 2014-05-09 9:57 ` Albert ARIBAUD 2014-05-05 17:59 ` Fabio Estevam 2 siblings, 1 reply; 12+ messages in thread From: Tom Rini @ 2014-05-05 17:46 UTC (permalink / raw) To: u-boot On Mon, May 05, 2014 at 10:46:36AM -0600, Stephen Warren wrote: > Albert, > > I was wondering when the next pull request for u-boot-arm/master -> > u-boot/master was likely to be? > > I asked because some changes to the Tegra USB driver went through the > u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > u-boot-usb/master. I have some more USB driver changes which rely on the > earlier USB patches, and these should really go through > u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > u-boot-usb/master needs to contain the patches currently in > u-boot-arm/master, and the best way for that to happen is for those > patches to get into u-boot/master so that u-boot-usb/master can merge them. > > Or, should Marek just merge u-boot-arm/master into his tree directly? There's also still a handful of outstanding other patches needing to go in, and really, I'm fine with more frequent PRs rather than waiting for everyone elses to percolate up and then get one with everything. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140505/a5614f40/attachment.pgp> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 17:46 ` Tom Rini @ 2014-05-09 9:57 ` Albert ARIBAUD 0 siblings, 0 replies; 12+ messages in thread From: Albert ARIBAUD @ 2014-05-09 9:57 UTC (permalink / raw) To: u-boot Hi Tom, On Mon, 5 May 2014 13:46:54 -0400, Tom Rini <trini@ti.com> wrote: > On Mon, May 05, 2014 at 10:46:36AM -0600, Stephen Warren wrote: > > > Albert, > > > > I was wondering when the next pull request for u-boot-arm/master -> > > u-boot/master was likely to be? > > > > I asked because some changes to the Tegra USB driver went through the > > u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > > u-boot-usb/master. I have some more USB driver changes which rely on the > > earlier USB patches, and these should really go through > > u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > > u-boot-usb/master needs to contain the patches currently in > > u-boot-arm/master, and the best way for that to happen is for those > > patches to get into u-boot/master so that u-boot-usb/master can merge them. > > > > Or, should Marek just merge u-boot-arm/master into his tree directly? > > There's also still a handful of outstanding other patches needing to go > in, and really, I'm fine with more frequent PRs rather than waiting for > everyone elses to percolate up and then get one with everything. I'll send out more frequent PRs. Amicalement, -- Albert. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 16:46 [U-Boot] Pull request for u-boot-arm -> u-boot? Stephen Warren 2014-05-05 17:46 ` Marek Vasut 2014-05-05 17:46 ` Tom Rini @ 2014-05-05 17:59 ` Fabio Estevam 2014-05-05 18:12 ` Otavio Salvador 2014-05-05 18:15 ` Stephen Warren 2 siblings, 2 replies; 12+ messages in thread From: Fabio Estevam @ 2014-05-05 17:59 UTC (permalink / raw) To: u-boot On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > Albert, > > I was wondering when the next pull request for u-boot-arm/master -> > u-boot/master was likely to be? > > I asked because some changes to the Tegra USB driver went through the > u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > u-boot-usb/master. I have some more USB driver changes which rely on the > earlier USB patches, and these should really go through > u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > u-boot-usb/master needs to contain the patches currently in > u-boot-arm/master, and the best way for that to happen is for those > patches to get into u-boot/master so that u-boot-usb/master can merge them. > > Or, should Marek just merge u-boot-arm/master into his tree directly? Or should we have a 'u-boot-next' tree using the same concept as the kernel 'linux-next'? ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 17:59 ` Fabio Estevam @ 2014-05-05 18:12 ` Otavio Salvador 2014-05-05 18:53 ` Marek Vasut 2014-05-05 18:15 ` Stephen Warren 1 sibling, 1 reply; 12+ messages in thread From: Otavio Salvador @ 2014-05-05 18:12 UTC (permalink / raw) To: u-boot On Mon, May 5, 2014 at 2:59 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: >> Albert, >> >> I was wondering when the next pull request for u-boot-arm/master -> >> u-boot/master was likely to be? >> >> I asked because some changes to the Tegra USB driver went through the >> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in >> u-boot-usb/master. I have some more USB driver changes which rely on the >> earlier USB patches, and these should really go through >> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, >> u-boot-usb/master needs to contain the patches currently in >> u-boot-arm/master, and the best way for that to happen is for those >> patches to get into u-boot/master so that u-boot-usb/master can merge them. >> >> Or, should Marek just merge u-boot-arm/master into his tree directly? > > Or should we have a 'u-boot-next' tree using the same concept as the > kernel 'linux-next'? Please, u-boot-next! It is clear we need this to scale the pull model. -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 18:12 ` Otavio Salvador @ 2014-05-05 18:53 ` Marek Vasut 0 siblings, 0 replies; 12+ messages in thread From: Marek Vasut @ 2014-05-05 18:53 UTC (permalink / raw) To: u-boot On Monday, May 05, 2014 at 08:12:18 PM, Otavio Salvador wrote: > On Mon, May 5, 2014 at 2:59 PM, Fabio Estevam <festevam@gmail.com> wrote: > > On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > >> Albert, > >> > >> I was wondering when the next pull request for u-boot-arm/master -> > >> u-boot/master was likely to be? > >> > >> I asked because some changes to the Tegra USB driver went through the > >> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > >> u-boot-usb/master. I have some more USB driver changes which rely on the > >> earlier USB patches, and these should really go through > >> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > >> u-boot-usb/master needs to contain the patches currently in > >> u-boot-arm/master, and the best way for that to happen is for those > >> patches to get into u-boot/master so that u-boot-usb/master can merge > >> them. > >> > >> Or, should Marek just merge u-boot-arm/master into his tree directly? > > > > Or should we have a 'u-boot-next' tree using the same concept as the > > kernel 'linux-next'? > > Please, u-boot-next! > > It is clear we need this to scale the pull model. As Stephen already explained, u-boot-next solves nothing. U-boot-next will actually be explicitly unhelpful here because I won't be able to work on top of it and then send PRs to Tom . This just cannot work as it would break history . Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 17:59 ` Fabio Estevam 2014-05-05 18:12 ` Otavio Salvador @ 2014-05-05 18:15 ` Stephen Warren 2014-05-05 18:40 ` Tom Rini 1 sibling, 1 reply; 12+ messages in thread From: Stephen Warren @ 2014-05-05 18:15 UTC (permalink / raw) To: u-boot On 05/05/2014 11:59 AM, Fabio Estevam wrote: > On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: >> Albert, >> >> I was wondering when the next pull request for u-boot-arm/master -> >> u-boot/master was likely to be? >> >> I asked because some changes to the Tegra USB driver went through the >> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in >> u-boot-usb/master. I have some more USB driver changes which rely on the >> earlier USB patches, and these should really go through >> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, >> u-boot-usb/master needs to contain the patches currently in >> u-boot-arm/master, and the best way for that to happen is for those >> patches to get into u-boot/master so that u-boot-usb/master can merge them. >> >> Or, should Marek just merge u-boot-arm/master into his tree directly? > > Or should we have a 'u-boot-next' tree using the same concept as the > kernel 'linux-next'? Having a u-boot-next won't solve this particular problem in any way. Having a u-boot-next allows any end-developer to develop on top of the combined code in all trees, thus detecting/avoiding any conflicts with them. However, my issue above is that a patch that's already applied in tree A needs to make its way into tree B, so that further patches can be *applied* in tree B. This is all about applying patches, not developing patches. The existence (or not) of a u-boot-next tree doesn't affect this issue at all. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 18:15 ` Stephen Warren @ 2014-05-05 18:40 ` Tom Rini 2014-05-05 18:52 ` Stephen Warren 2014-05-05 18:54 ` Marek Vasut 0 siblings, 2 replies; 12+ messages in thread From: Tom Rini @ 2014-05-05 18:40 UTC (permalink / raw) To: u-boot On Mon, May 05, 2014 at 12:15:50PM -0600, Stephen Warren wrote: > On 05/05/2014 11:59 AM, Fabio Estevam wrote: > > On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > >> Albert, > >> > >> I was wondering when the next pull request for u-boot-arm/master -> > >> u-boot/master was likely to be? > >> > >> I asked because some changes to the Tegra USB driver went through the > >> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > >> u-boot-usb/master. I have some more USB driver changes which rely on the > >> earlier USB patches, and these should really go through > >> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > >> u-boot-usb/master needs to contain the patches currently in > >> u-boot-arm/master, and the best way for that to happen is for those > >> patches to get into u-boot/master so that u-boot-usb/master can merge them. > >> > >> Or, should Marek just merge u-boot-arm/master into his tree directly? > > > > Or should we have a 'u-boot-next' tree using the same concept as the > > kernel 'linux-next'? > > Having a u-boot-next won't solve this particular problem in any way. > > Having a u-boot-next allows any end-developer to develop on top of the > combined code in all trees, thus detecting/avoiding any conflicts with them. > > However, my issue above is that a patch that's already applied in tree A > needs to make its way into tree B, so that further patches can be > *applied* in tree B. This is all about applying patches, not developing > patches. The existence (or not) of a u-boot-next tree doesn't affect > this issue at all. This is in fact a usual problem in Linux land where it seems like we have much more stringent rules on how things can go in. So long as people can collect the needed acks, I'm fine pulling things that touch a few areas into master. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140505/b3a2bb97/attachment.pgp> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 18:40 ` Tom Rini @ 2014-05-05 18:52 ` Stephen Warren 2014-05-05 18:54 ` Marek Vasut 1 sibling, 0 replies; 12+ messages in thread From: Stephen Warren @ 2014-05-05 18:52 UTC (permalink / raw) To: u-boot On 05/05/2014 12:40 PM, Tom Rini wrote: > On Mon, May 05, 2014 at 12:15:50PM -0600, Stephen Warren wrote: >> On 05/05/2014 11:59 AM, Fabio Estevam wrote: >>> On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: >>>> Albert, >>>> >>>> I was wondering when the next pull request for u-boot-arm/master -> >>>> u-boot/master was likely to be? >>>> >>>> I asked because some changes to the Tegra USB driver went through the >>>> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in >>>> u-boot-usb/master. I have some more USB driver changes which rely on the >>>> earlier USB patches, and these should really go through >>>> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, >>>> u-boot-usb/master needs to contain the patches currently in >>>> u-boot-arm/master, and the best way for that to happen is for those >>>> patches to get into u-boot/master so that u-boot-usb/master can merge them. >>>> >>>> Or, should Marek just merge u-boot-arm/master into his tree directly? >>> >>> Or should we have a 'u-boot-next' tree using the same concept as the >>> kernel 'linux-next'? >> >> Having a u-boot-next won't solve this particular problem in any way. >> >> Having a u-boot-next allows any end-developer to develop on top of the >> combined code in all trees, thus detecting/avoiding any conflicts with them. >> >> However, my issue above is that a patch that's already applied in tree A >> needs to make its way into tree B, so that further patches can be >> *applied* in tree B. This is all about applying patches, not developing >> patches. The existence (or not) of a u-boot-next tree doesn't affect >> this issue at all. > > This is in fact a usual problem in Linux land where it seems like we > have much more stringent rules on how things can go in. So long as > people can collect the needed acks, I'm fine pulling things that touch a > few areas into master. In Linux, cross-repo dependencies are often dealt with by: a) If the dependency is known up-front: Create a branch based on a recent mainline release, apply the few dependency patches there, then merge this topic branch into multiple repos/branches as a baseline for future work. b) If the dependency is noticed later, then merge the source branch into the destination branch when the dependencies show up. This ends up pulling in more patches than you need/want into the merge target if the merge source wasn't using topic branches, so isn't a great solution, and isn't done too much. In general, the situation we that caused me to start the thread is avoided by disallowing patches for e.g. USB drivers to go through anything but the USB tree, unless special arrangements are made to do (a). (a) would allow the conflict to be resolved quickly in the relevant subsystem trees rather than through Linus. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] Pull request for u-boot-arm -> u-boot? 2014-05-05 18:40 ` Tom Rini 2014-05-05 18:52 ` Stephen Warren @ 2014-05-05 18:54 ` Marek Vasut 1 sibling, 0 replies; 12+ messages in thread From: Marek Vasut @ 2014-05-05 18:54 UTC (permalink / raw) To: u-boot On Monday, May 05, 2014 at 08:40:34 PM, Tom Rini wrote: > On Mon, May 05, 2014 at 12:15:50PM -0600, Stephen Warren wrote: > > On 05/05/2014 11:59 AM, Fabio Estevam wrote: > > > On Mon, May 5, 2014 at 1:46 PM, Stephen Warren <swarren@wwwdotorg.org> wrote: > > >> Albert, > > >> > > >> I was wondering when the next pull request for u-boot-arm/master -> > > >> u-boot/master was likely to be? > > >> > > >> I asked because some changes to the Tegra USB driver went through the > > >> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in > > >> u-boot-usb/master. I have some more USB driver changes which rely on > > >> the earlier USB patches, and these should really go through > > >> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, > > >> u-boot-usb/master needs to contain the patches currently in > > >> u-boot-arm/master, and the best way for that to happen is for those > > >> patches to get into u-boot/master so that u-boot-usb/master can merge > > >> them. > > >> > > >> Or, should Marek just merge u-boot-arm/master into his tree directly? > > > > > > Or should we have a 'u-boot-next' tree using the same concept as the > > > kernel 'linux-next'? > > > > Having a u-boot-next won't solve this particular problem in any way. > > > > Having a u-boot-next allows any end-developer to develop on top of the > > combined code in all trees, thus detecting/avoiding any conflicts with > > them. > > > > However, my issue above is that a patch that's already applied in tree A > > needs to make its way into tree B, so that further patches can be > > *applied* in tree B. This is all about applying patches, not developing > > patches. The existence (or not) of a u-boot-next tree doesn't affect > > this issue at all. > > This is in fact a usual problem in Linux land where it seems like we > have much more stringent rules on how things can go in. So long as > people can collect the needed acks, I'm fine pulling things that touch a > few areas into master. The problem here is that I cannot apply the USB patches from Stephen until Albert gets his stuff into U-Boot/master, which I would then merge back into mine. Only then I can apply the USB patches. So we're waiting for Albert ... Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-05-09 9:57 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-05-05 16:46 [U-Boot] Pull request for u-boot-arm -> u-boot? Stephen Warren 2014-05-05 17:46 ` Marek Vasut 2014-05-09 8:39 ` Albert ARIBAUD 2014-05-05 17:46 ` Tom Rini 2014-05-09 9:57 ` Albert ARIBAUD 2014-05-05 17:59 ` Fabio Estevam 2014-05-05 18:12 ` Otavio Salvador 2014-05-05 18:53 ` Marek Vasut 2014-05-05 18:15 ` Stephen Warren 2014-05-05 18:40 ` Tom Rini 2014-05-05 18:52 ` Stephen Warren 2014-05-05 18:54 ` Marek Vasut
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.