Marshall Dawson 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:
(1 comment)
Is it correct now? I've done a rebase with squash... Why the merge conflict is still active?
The "merge conflict" means this patch cannot be submitted on its own. Git/Gerrit will attempt to be a little conservative in making the determination, opting for human interaction instead. There are two typical reasons why this may be. (a) A patch is based on work not yet merged, and this looks like the case here. This change makes a modification to the same line of code modified in CB:37546. "Merge conflict" often causes unnecessary confusion in this scenario, however it's typical to push patch stacks with the intent of them being submitted in order. (b) Another reason you may encounter the "merge conflict" is when the file itself has been modified in the history. That is, if your work is based on an older version of the repo, then you would need to rebase on something newer and fix up any problems that Git can't solve on its own.
By the way, you'll also need to mark all unresolved inline comments as Done before it can be merged. The easiest way I know to find these is to click in the area just above the filename list, i.e. "Files Base Patchset 6". Click on Base or the patchset number and you'll see where something is still unresolved.
https://review.coreboot.org/c/coreboot/+/37551/6/src/include/device/pci_ids.... File src/include/device/pci_ids.h:
https://review.coreboot.org/c/coreboot/+/37551/6/src/include/device/pci_ids.... PS6, Line 450: #define PCI_DEVICE_ID_AMD_CZ_SATA_IDE 0x7900 Can this change be squashed with https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids....