From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, Jean Delvare <khali@linux-fr.org>
Subject: linux-next: driver-core/i2c merge conflicts
Date: Mon, 26 May 2008 12:18:20 +1000 [thread overview]
Message-ID: <20080526121820.03d27324.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
Hi Greg, Jean,
Today's linux-next merge of the i2c tree got conflicts in
drivers/i2c/i2c-core.c between "i2c-use-class_for_each_device" from the
driver-core tree" and "i2c: Use class_for_each_device", "i2c: Use
list_for_each_entry_safe" and "i2c: Simplify i2c_del_driver()" from the
i2c tree.
I used the version from the i2c tree except I added NULL for the new
parameter to class_for_each_device. This merge fixup has replaced the
build fixup in the previous linux-next tree.
--
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-26 2:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-26 2:18 Stephen Rothwell [this message]
2008-05-26 6:05 ` linux-next: driver-core/i2c merge conflicts 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=20080526121820.03d27324.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--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).