Hi James, On Fri, 8 Feb 2013 17:32:15 -0800, James Ralston wrote: > This patch adds the SMBus Device IDs for the Intel Wellsburg PCH > > Signed-off-by: James Ralston <james.d.ralston@xxxxxxxxx> > --- > Documentation/i2c/busses/i2c-i801 | 1 + > drivers/i2c/busses/Kconfig | 1 + > drivers/i2c/busses/i2c-i801.c | 3 +++ > 3 files changed, 5 insertions(+), 0 deletions(-) > (...) Seth recently sent a patch adding IDs for the Avoton: http://marc.info/?l=linux-kernel&m=135959209218860&w=2 Your patch conflicts with his. Please rebase on top of Seth's patch, so that both patches can be applied in sequence. > (...) > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > (...) > @@ -165,6 +166,7 @@ > #define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330 > #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS 0x3b30 > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 > +#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22 > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS 0x9c22 Please keep sorted by ID. -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
