Attention is currently required from: Felix Singer, Thomas Heijligen, Angel Pons.

View Change

1 comment:

• File stlinkv3_spi.c:

  • Patch Set #1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx,

    `(all conflicts fixed: run "git cherry-pick --continue")`

    I did 'cherry-pick --continue', was able to edit the commit. I believe the 'update' part of this patch is done. Then I tried `git pull --rebase upstream master` which ran successfully. I am trying to `git push upstream HEAD:refs/for/master%topic=stlink_uinit_vars_fix` but it fails with
    ```
    ! [remote rejected] HEAD -> refs/for/master%topic=stlink_uinit_vars_fix (duplicate request)
    error: failed to push some refs to 'https://review.coreboot.org/flashrom'
    ```
    `git log` shows the HEAD at the local branch I made to edit the changes.

To view, visit change 66225. To unsubscribe, or for help writing mail filters, visit settings.