search

koverstreet / bcachefs

Other
643 stars 71 forks source link

Failing to merge stable tag 6.6.1 [e7b654a58af9f45d8b4490fd75a475f4c144bed6] #609

Closed Valmar33 closed 8 months ago

Valmar33 commented 8 months ago

When attempting to compile with upstream tag 6.6.1 merged in, I get this error:

Auto-merging include/linux/pci_ids.h CONFLICT (content): Merge conflict in include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result.

Valmar33 commented 8 months ago

Looking into the actual merge conflict itself...

bcachefs master has this

define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3

define PCI_DEVICE_ID_AMD_MI300_DF_F3 0x152b

define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703

While 6.6.1 has this

define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3

define PCI_DEVICE_ID_AMD_VANGOGH_USB 0x163a

define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703

Valmar33 commented 8 months ago

This is irrelevant now, due to bcachefs master being based on 6.7-rc2