On Mon, Apr 18, 2022 at 12:02:54AM +0100, Maciej W. Rozycki wrote: > On Fri, 15 Apr 2022, Greg Kroah-Hartman wrote: > > > > Index: linux-macro/include/linux/pci_ids.h > > > =================================================================== > > > --- linux-macro.orig/include/linux/pci_ids.h > > > +++ linux-macro/include/linux/pci_ids.h > > > @@ -2622,6 +2622,9 @@ > > > #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 > > > #define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 > > > > > > +#define PCI_VENDOR_ID_ENDRUN 0x7401 > > > +#define PCI_DEVICE_ID_ENDRUN_1588 0xe100 > > > > As per the top of this file, this should not be needed here as you are > > only using it in one file. Please leave it as-is. > > I find this requirement silly, but here it's not the place to discuss it, You have not had to deal with merge issues in this file before. Think about every single PCI driver author updating this single file. That just does not work at the scale we run at, sorry. I put this rule into place 15+ years ago for that reason. thanks, greg k-h