From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Thu, 01 May 2014 15:47:44 -0600
Subject: [U-Boot] [PATCH 7/8] ums: move all variable declarations to the
 start of the block
In-Reply-To: <20140501214321.47c09419@jawa>
References: <1398892402-9816-1-git-send-email-swarren@wwwdotorg.org>	<1398892402-9816-7-git-send-email-swarren@wwwdotorg.org>	<201405011251.25998.marex@denx.de>	<53627D4A.6000401@wwwdotorg.org>
	<20140501214321.47c09419@jawa>
Message-ID: <5362C100.2060002@wwwdotorg.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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 <swarren@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.marczak@samsung.com>
>>>> Cc: Lukasz Majewski <l.majewski@samsung.com>
>>>> Signed-off-by: Stephen Warren <swarren@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.