From: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
To: James Ralston <james.d.ralston-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Seth Heasley
<seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: [PATCH 3/5] i2c-i801: Add Device IDs for Intel Wellsburg PCH
Date: Sat, 9 Feb 2013 20:00:10 +0100 [thread overview]
Message-ID: <20130209200010.1b18fdb3@endymion.delvare> (raw)
In-Reply-To: <1360373535-2055-1-git-send-email-james.d.ralston-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
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-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
> 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
next prev parent reply other threads:[~2013-02-09 19:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-09 1:32 [PATCH 3/5] i2c-i801: Add Device IDs for Intel Wellsburg PCH James Ralston
[not found] ` <1360373535-2055-1-git-send-email-james.d.ralston-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2013-02-09 19:00 ` Jean Delvare [this message]
[not found] ` <20130209200010.1b18fdb3-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
2013-02-10 18:38 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130209200010.1b18fdb3@endymion.delvare \
--to=khali-puyad+kwke1g9huczpvpmw@public.gmane.org \
--cc=james.d.ralston-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox