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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjD6ipezr0Z.pgp
Description: PGP signature
