Jorge Fernandez has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37551 )
Change subject: amd/hudson: Rename PCI IDs for FCH SATA Controller ......................................................................
Patch Set 6:
Patch Set 4:
Patch Set 4:
Patch Set 4:
Patch Set 4:
(3 comments)
Sorry, how can I generate the changes? I have to push a new commit? I can modify the comment editing it from the webpage but I don't know how to modify the pci_ids.h file...
The online editor seems only somewhat useful and the file editor is kind of clunky, so it might be better to push updates to your changes, especially if you've been asked to "squash" patches. In case you're not familiar with that process, I looked around a little and found this near the top of Google results https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-hi... Until your changes are approved and merged, you're free to rewrite your on history. Just keep the Change-Id portion of your commit message, as that's how Gerrit tracks which change you're repushing.
If the commit you want to edit is at the top, you can also use `git commit --amend`.
Is it correct now? I've done a rebase with squash... Why the merge conflict is still active?