* linux-next: driver-core/i2c merge conflicts
@ 2008-05-26 2:18 Stephen Rothwell
2008-05-26 6:05 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-05-26 2:18 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Jean Delvare
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: driver-core/i2c merge conflicts
2008-05-26 2:18 linux-next: driver-core/i2c merge conflicts Stephen Rothwell
@ 2008-05-26 6:05 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-05-26 6:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Jean Delvare
On Mon, May 26, 2008 at 12:18:20PM +1000, Stephen Rothwell wrote:
> 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.
Thanks, the fixup is fine, I ended up duplicating the same work in the
i2c tree accidentally for a different reason, as it is needed for some
class rework in the driver core tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-26 6:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-26 2:18 linux-next: driver-core/i2c merge conflicts Stephen Rothwell
2008-05-26 6:05 ` Greg KH
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).