From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jean Delvare <khali@linux-fr.org>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, Kay Sievers <kay.sievers@vrfy.org>
Subject: linux-next: i2c/driver-core merge conflict
Date: Thu, 15 May 2008 12:00:06 +1000 [thread overview]
Message-ID: <20080515120006.b336a720.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2008-05-15 2:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 2:00 Stephen Rothwell [this message]
2008-05-15 3:09 ` linux-next: i2c/driver-core merge conflict Greg KH
2008-05-15 7:58 ` Jean Delvare
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=20080515120006.b336a720.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=kay.sievers@vrfy.org \
--cc=khali@linux-fr.org \
--cc=linux-next@vger.kernel.org \
/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).