Re: [Openocd-development] patch overlap

2011-10-23 Thread Øyvind Harboe
> There is probably something to tune in the automatic merge from gerrit to git. Weird, obscure, correct and innocuous :-) Many thanks for helping out w/cleaning up the code btw! I'd like to get the code to a state where it compiles clean of scan-build warnings and we can switch to requiring clea

[Openocd-development] patch overlap

2011-10-23 Thread Antonio Borneo
Hi Øyvind, there are 2 patches submitted in gerrit for the same file and same lines 1) http://openocd.zylin.com/45 2) http://openocd.zylin.com/52 The patch have both passed the approval process and are now in git. As result, the patch 2) as been merged in git as first. ok. When later on 1) as bee