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:-( _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
