Looks like this would need a manual rebase? It currently displays as "Merge Conflict"

View Change

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ic7f04fc5cbe3422cbd219c46586c32fc847c921f
Gerrit-Change-Number: 37677
Gerrit-PatchSet: 1
Gerrit-Owner: Gaggery Tsai <gaggery.tsai@intel.com>
Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Angel Pons <th3fanbus@gmail.com>
Gerrit-CC: Nico Huber <nico.h@gmx.de>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Comment-Date: Sun, 22 Mar 2020 22:49:50 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment