* linux-next: manual merge of the drm tree with the i2c tree
@ 2010-10-07 2:42 Stephen Rothwell
2010-10-07 7:41 ` Jean Delvare
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-10-07 2:42 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Chris Wilson, Jean Delvare
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_i2c.c between commit
2d3e8209c9d3abf6e831158e9814f50c57275487 ("i2c: Remove unneeded
inclusions of <linux/i2c-id.h>") from the i2c tree and commit
f899fc64cda8569d0529452aafc0da31c042df2e ("drm/i915: use GMBUS to manage
i2c links") from the drm tree.
Again, both commits removed the inclusion of linux/i2.-id.h, so I used
the drm tree verison.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the drm tree with the i2c tree
2010-10-07 2:42 linux-next: manual merge of the drm tree with the i2c tree Stephen Rothwell
@ 2010-10-07 7:41 ` Jean Delvare
0 siblings, 0 replies; 3+ messages in thread
From: Jean Delvare @ 2010-10-07 7:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Dave Airlie, linux-next, linux-kernel, Chris Wilson
Hi Stephen,
On Thu, 7 Oct 2010 13:42:20 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_i2c.c between commit
> 2d3e8209c9d3abf6e831158e9814f50c57275487 ("i2c: Remove unneeded
> inclusions of <linux/i2c-id.h>") from the i2c tree and commit
> f899fc64cda8569d0529452aafc0da31c042df2e ("drm/i915: use GMBUS to manage
> i2c links") from the drm tree.
>
> Again, both commits removed the inclusion of linux/i2.-id.h, so I used
> the drm tree verison.
Thanks for the heads up. I've stripped the removal in the two
conflicting files on my side, so it should be OK again. If there are
more similar cases in the future, the resolution will be the same.
--
Jean Delvare
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the drm tree with the i2c tree
@ 2010-10-07 2:40 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2010-10-07 2:40 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Chris Wilson, Jean Delvare
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_drv.h between commit
2d3e8209c9d3abf6e831158e9814f50c57275487 ("i2c: Remove unneeded
inclusions of <linux/i2c-id.h>") from the i2c tree and commit
f899fc64cda8569d0529452aafc0da31c042df2e ("drm/i915: use GMBUS to manage
i2c links") from the drm tree.
I fixed it up (both commits removed linux/i2c-id.h, so I used the drm
tree version).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-07 7:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-07 2:42 linux-next: manual merge of the drm tree with the i2c tree Stephen Rothwell
2010-10-07 7:41 ` Jean Delvare
-- strict thread matches above, loose matches on Subject: below --
2010-10-07 2:40 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox