| Message ID | 20140526074627.335e11d2@amdc2363 |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > Hi Marek > > The following changes since commit > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > dfu, nand: add medium specific polltimeout function (2014-05-08 > 10:38:30 +0200) > > are available in the git repository at: > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > for you to fetch changes up to 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > dfu: Introduction of the "dfu_hash_algo" env variable for checksum > method setting (2014-05-26 07:31:54 +0200) > > ---------------------------------------------------------------- > Lukasz Majewski (1): > dfu: Introduction of the "dfu_hash_algo" env variable for > checksum method setting I had merge conflict here, so I picked the one patch by hand. Thanks! Best regards, Marek Vasut
Hi Marek, > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > Hi Marek > > > > The following changes since commit > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > dfu, nand: add medium specific polltimeout function (2014-05-08 > > 10:38:30 +0200) > > > > are available in the git repository at: > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > for you to fetch changes up to > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > dfu: Introduction of the "dfu_hash_algo" env variable for checksum > > method setting (2014-05-26 07:31:54 +0200) > > > > ---------------------------------------------------------------- > > Lukasz Majewski (1): > > dfu: Introduction of the "dfu_hash_algo" env variable for > > checksum method setting > > I had merge conflict here, so I picked the one patch by hand. I see. Thanks Marek! > > Thanks! > > Best regards, > Marek Vasut
Hi Marek, > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > Hi Marek > > > > The following changes since commit > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > dfu, nand: add medium specific polltimeout function (2014-05-08 > > 10:38:30 +0200) > > > > are available in the git repository at: > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > for you to fetch changes up to > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > dfu: Introduction of the "dfu_hash_algo" env variable for checksum > > method setting (2014-05-26 07:31:54 +0200) > > > > ---------------------------------------------------------------- > > Lukasz Majewski (1): > > dfu: Introduction of the "dfu_hash_algo" env variable for > > checksum method setting > > I had merge conflict here, so I picked the one patch by hand. Unfortunately you took the v3 of the patch. As fair as I remember on the list we have agreed that we will use v4 of it. You could replace the v3 patch which is still only on the u-boot-usb tree, or I will prepare a "diff" patch between v3 and v4. What do you prefer? > > Thanks! > > Best regards, > Marek Vasut
Hi Marek, > Hi Marek, > > > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > > Hi Marek > > > > > > The following changes since commit > > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > > > dfu, nand: add medium specific polltimeout function (2014-05-08 > > > 10:38:30 +0200) > > > > > > are available in the git repository at: > > > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > > > for you to fetch changes up to > > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > checksum method setting (2014-05-26 07:31:54 +0200) > > > > > > ---------------------------------------------------------------- > > > Lukasz Majewski (1): > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > checksum method setting > > > > I had merge conflict here, so I picked the one patch by hand. > I've made a little mistake. The v4 was merged indeed, however on the list we have agreed to merge v3. Rest of the mail is correct :-). Sorry for confusion. > Unfortunately you took the v3 of the patch. As fair as I remember on > the list we have agreed that we will use v4 of it. > > You could replace the v3 patch which is still only on the u-boot-usb > tree, or I will prepare a "diff" patch between v3 and v4. > > What do you prefer? > > > > > Thanks! > > > > Best regards, > > Marek Vasut > > >
On Monday, June 09, 2014 at 12:51:43 PM, Lukasz Majewski wrote: > Hi Marek, > > > Hi Marek, > > > > > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > > > Hi Marek > > > > > > > > The following changes since commit > > > > > > > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > dfu, nand: add medium specific polltimeout function (2014-05-08 > > > > 10:38:30 +0200) > > > > > > > > are available in the git repository at: > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > > > > > for you to fetch changes up to > > > > > > > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > > > > > > checksum method setting (2014-05-26 07:31:54 +0200) > > > > > > > > ---------------------------------------------------------------- > > > > > > > > Lukasz Majewski (1): > > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > > > > > > checksum method setting > > > > > > I had merge conflict here, so I picked the one patch by hand. > > I've made a little mistake. The v4 was merged indeed, however on the > list we have agreed to merge v3. Rest of the mail is correct :-). > > Sorry for confusion. Please send me an incremental patch. I don't want to rewrite history, so I will apply it on top of the current stuff. Best regards, Marek Vasut
Hi Marek, > On Monday, June 09, 2014 at 12:51:43 PM, Lukasz Majewski wrote: > > Hi Marek, > > > > > Hi Marek, > > > > > > > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > > > > Hi Marek > > > > > > > > > > The following changes since commit > > > > > > > > > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > > dfu, nand: add medium specific polltimeout function > > > > > (2014-05-08 10:38:30 +0200) > > > > > > > > > > are available in the git repository at: > > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > > > > > > > for you to fetch changes up to > > > > > > > > > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > > > > > > > > checksum method setting (2014-05-26 07:31:54 +0200) > > > > > > > > > > ---------------------------------------------------------------- > > > > > > > > > > Lukasz Majewski (1): > > > > > dfu: Introduction of the "dfu_hash_algo" env variable > > > > > for > > > > > > > > > > checksum method setting > > > > > > > > I had merge conflict here, so I picked the one patch by hand. > > > > I've made a little mistake. The v4 was merged indeed, however on the > > list we have agreed to merge v3. Rest of the mail is correct :-). > > > > Sorry for confusion. > > Please send me an incremental patch. I don't want to rewrite history, > so I will apply it on top of the current stuff. Ok. Great :=) > > Best regards, > Marek Vasut
On Tuesday, June 10, 2014 at 08:10:01 AM, Lukasz Majewski wrote: > Hi Marek, > > > On Monday, June 09, 2014 at 12:51:43 PM, Lukasz Majewski wrote: > > > Hi Marek, > > > > > > > Hi Marek, > > > > > > > > > On Monday, May 26, 2014 at 07:46:27 AM, Lukasz Majewski wrote: > > > > > > Hi Marek > > > > > > > > > > > > The following changes since commit > > > > > > > > > > > > fc25fa27e5f439705e9ca42182014e2d75d9f0ae: > > > > > > dfu, nand: add medium specific polltimeout function > > > > > > > > > > > > (2014-05-08 10:38:30 +0200) > > > > > > > > > > > > are available in the git repository at: > > > > > > ssh://gu-dfu@git.denx.de/u-boot-dfu master > > > > > > > > > > > > for you to fetch changes up to > > > > > > > > > > > > 03bc75c206e25e8aeb8bbbb070b86424f7860453: > > > > > > dfu: Introduction of the "dfu_hash_algo" env variable for > > > > > > > > > > > > checksum method setting (2014-05-26 07:31:54 +0200) > > > > > > > > > > > > ---------------------------------------------------------------- > > > > > > > > > > > > Lukasz Majewski (1): > > > > > > dfu: Introduction of the "dfu_hash_algo" env variable > > > > > > > > > > > > for > > > > > > > > > > > > checksum method setting > > > > > > > > > > I had merge conflict here, so I picked the one patch by hand. > > > > > > I've made a little mistake. The v4 was merged indeed, however on the > > > list we have agreed to merge v3. Rest of the mail is correct :-). > > > > > > Sorry for confusion. > > > > Please send me an incremental patch. I don't want to rewrite history, > > so I will apply it on top of the current stuff. > > Ok. Great :=) Thanks! Best regards, Marek Vasut
Hi Marek The following changes since commit fc25fa27e5f439705e9ca42182014e2d75d9f0ae: dfu, nand: add medium specific polltimeout function (2014-05-08 10:38:30 +0200) are available in the git repository at: ssh://gu-dfu@git.denx.de/u-boot-dfu master for you to fetch changes up to 03bc75c206e25e8aeb8bbbb070b86424f7860453: dfu: Introduction of the "dfu_hash_algo" env variable for checksum method setting (2014-05-26 07:31:54 +0200) ---------------------------------------------------------------- Lukasz Majewski (1): dfu: Introduction of the "dfu_hash_algo" env variable for checksum method setting drivers/dfu/dfu.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-)