I downloaded this patch on the top of the tree locally, it got applied automatically, no conflict resolutions were needed. I also checked that flash.h in latest patchset is up-to-date (contains SR3 support).
You can also use Gerrit's Rebase feature. What you did is exactly what
"Rebase on top of the master branch (breaks relation chain)" does. If
that fails, nothing happens, if it works, you know the patch applied
cleanly (and you, and other, can still verify things in Gerrit).
No need to do so, I guess I got used to it because it saves me one
switch to the command line and back when I "only wanted to merge
To view, visit change 58622. To unsubscribe, or for help writing mail filters, visit settings.