Thanks for your patch, but I can't figure out exactly what problem you're solving. There is only one definition of PCI_VENDOR_ID_SUNIX in the current upstream tree, so I don't see what the conflict is. If there's a conflicting definition in some out-of-tree driver, we generally wouldn't change the upstream tree, we'd ask you to change the out-of-tree driver. Or even better, to merge your driver into the upstream kernel so it's no longer maintained out of the tree. Please start with https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst Bjorn On Tue, Jan 22, 2019 at 10:22:37AM +0800, saumah wrote: > Signed-off-by: saumah <saumah@xxxxxxxxx> > --- > ....-8250-16550-build-in-driver-conflic.patch | 28 ------------------- > 1 file changed, 28 deletions(-) > delete mode 100644 0001-pci_ids.h-change.-8250-16550-build-in-driver-conflic.patch > > diff --git a/0001-pci_ids.h-change.-8250-16550-build-in-driver-conflic.patch b/0001-pci_ids.h-change.-8250-16550-build-in-driver-conflic.patch > deleted file mode 100644 > index dd1b7bf..0000000 > --- a/0001-pci_ids.h-change.-8250-16550-build-in-driver-conflic.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 15a467e9bb45d76a9373cb21c499a0cb21df2dda Mon Sep 17 00:00:00 2001 > -From: Morris Ku <morris_ku@xxxxxxxxx> > -Date: Tue, 8 Jan 2019 20:08:48 +0800 > -Subject: [PATCH] pci_ids.h change. 8250/16550 build-in driver conflict with SUNIX Multi-I/O Borad Driver > - > -Signed-off-by: Morris Ku <morris_ku@xxxxxxxxx> > ---- > - pci_ids.h | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/pci_ids.h b/pci_ids.h > -index 2950223..b681a66 100644 > ---- a/pci_ids.h > -+++ b/pci_ids.h > -@@ -2567,8 +2567,8 @@ > - #define PCI_DEVICE_ID_TEHUTI_3010 0x3010 > - #define PCI_DEVICE_ID_TEHUTI_3014 0x3014 > - > --#define PCI_VENDOR_ID_SUNIX 0x1fd4 > --#define PCI_DEVICE_ID_SUNIX_1999 0x1999 > -+//#define PCI_VENDOR_ID_SUNIX 0x1fd4 > -+//#define PCI_DEVICE_ID_SUNIX_1999 0x1999 > - > - #define PCI_VENDOR_ID_HINT 0x3388 > - #define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013 > --- > -2.17.1 > - > -- > 2.17.1 >
