On 05/01/2014 01:43 PM, Lukasz Majewski wrote: > Hi Stephen, > >> >> On 05/01/2014 04:51 AM, Marek Vasut wrote: >>> On Wednesday, April 30, 2014 at 11:13:21 PM, Stephen Warren wrote: >>>> From: Stephen Warren <swar...@nvidia.com> >>>> >>>> It's easier to assign values to the variables inside an if >>>> statement body if the assignment and declaration are separate. >>>> >>>> Cc: Przemyslaw Marczak <p.marc...@samsung.com> >>>> Cc: Lukasz Majewski <l.majew...@samsung.com> >>>> Signed-off-by: Stephen Warren <swar...@nvidia.com> >>>> --- >>>> common/cmd_usb_mass_storage.c | 24 ++++++++++++++++-------- >>>> 1 file changed, 16 insertions(+), 8 deletions(-) >>> >>> This doesn't apply on u-boot-usb/master, sorry. >> >> Is this the first patch in the series which doesn't apply? Did you >> apply any of the earlier patches? I guess I'll go try to rebase the >> series and find out myself... >> >> This is why we need a "uboot-next" just like linux-next, and stricter >> controls on which git repos take patches that touch subsystem code, to >> avoid cross-repo conflicts:-( > > +1 > > Yesterday Marek and I agreed that some patches regarding DFU and > gadgets (patches 1 to 8) done by Mateusz: > > http://patchwork.ozlabs.org/patch/343517/ > > will be go through u-boot-dfu tree, which will be rebased on top of > u-boot-usb tree. Afterwards I will send PR to Marek. > > Unfortunately I didn't manage to add them to u-boot-denx tree yesterday. > I will do it on Monday as well as the review regarding your ums work. I > hope, that you can wait until then.
OK, that's fine. FWIW, I have applied that series locally and rebased my patches on top of it. If you want to see the latest version, feel free to look at: git://github.com/swarren/u-boot.git tegra_dev Note that branch gets rebased as I do local development. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
