From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Airlie <airlied@linux.ie>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: linux-next: manual merge of the drm tree with the i2c tree
Date: Thu, 7 Oct 2010 09:41:29 +0200 [thread overview]
Message-ID: <20101007094129.5038bc9e@endymion.delvare> (raw)
In-Reply-To: <20101007134220.d926a652.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-10-07 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-07 2:40 Stephen Rothwell
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=20101007094129.5038bc9e@endymion.delvare \
--to=khali@linux-fr.org \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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