Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1302318 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-01-06 02:40 +0100 |
| Last post | 2016-01-06 09:30 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-06 02:40 +0100
Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-01-06 02:50 +0100
Re: linux-next: manual merge of the pm tree with the i2c tree Wolfram Sang <wsa@the-dreams.de> - 2016-01-06 09:30 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-06 02:40 +0100 |
| Subject | linux-next: manual merge of the pm tree with the i2c tree |
| Message-ID | <qNLeV-2Fc-11@gated-at.bofh.it> |
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/i2c/busses/i2c-designware-platdrv.c
between commit:
90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
from the i2c tree and commit:
a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index 4f86d0795f7f,bf72ae740fc1..000000000000
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -122,7 -123,7 +123,8 @@@ static const struct acpi_device_id dw_i
{ "80860F41", 0 },
{ "808622C1", 0 },
{ "AMD0010", ACCESS_INTR_MASK },
+ { "AMDI0510", 0 },
+ { "APMC0D0F", 0 },
{ }
};
MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-01-06 02:50 +0100 |
| Message-ID | <qNLoB-2IC-3@gated-at.bofh.it> |
| In reply to | #1302318 |
On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/i2c/busses/i2c-designware-platdrv.c
>
> between commit:
>
> 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
>
> from the i2c tree and commit:
>
> a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me and thanks for taking care of this!
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Wolfram Sang <wsa@the-dreams.de> |
|---|---|
| Date | 2016-01-06 09:30 +0100 |
| Message-ID | <qNRDJ-71N-17@gated-at.bofh.it> |
| In reply to | #1302322 |
[Multipart message — attachments visible in raw view] — view raw
> > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Looks good to me and thanks for taking care of this! Ditto. Thanks!
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web