From: Jean Delvare <khali@linux-fr.org>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: linux-next: i2c/driver-core merge conflict
Date: Thu, 15 May 2008 09:58:14 +0200 [thread overview]
Message-ID: <20080515095814.49e03731@hyperion.delvare> (raw)
In-Reply-To: <20080515030942.GA1638@kroah.com>
On Wed, 14 May 2008 20:09:42 -0700, Greg KH wrote:
> On Thu, May 15, 2008 at 12:00:06PM +1000, Stephen Rothwell wrote:
> > Hi Jean, Greg,
> >
> > Today's linux-next merge of the i2c tree got a conflict in
> > include/linux/i2c.h between commit
> > e38c93bf253cb3176478a1943cd2306e8413d2bb ("driver core: remove
> > KOBJ_NAME_LEN define") from the driver-core tree and commit
> > f625810ef235a8b238427df3129792f89187c085 ("i2c: Kill the old driver
> > matching scheme") from the i2c tree. The former changes the definition
> > of driver_name in two places, the letter removes the definitions. I went
> > with the latter.
>
> Thanks, that should be the correct one.
Correct, thanks.
Greg, note that I plan to send this patch to Linus quickly, so you will
have to adjust your patch (i.e. simply remove the linux/i2c.h chunks
that no longer apply) for 2.6.26-rc3.
--
Jean Delvare
next prev parent reply other threads:[~2008-05-15 7:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 2:00 linux-next: i2c/driver-core merge conflict Stephen Rothwell
2008-05-15 3:09 ` Greg KH
2008-05-15 7:58 ` Jean Delvare [this message]
2008-05-15 18:47 ` Greg KH
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=20080515095814.49e03731@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=greg@kroah.com \
--cc=kay.sievers@vrfy.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;
as well as URLs for NNTP newsgroup(s).