linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: driver-core/i2c merge conflicts
Date: Sun, 25 May 2008 23:05:46 -0700	[thread overview]
Message-ID: <20080526060546.GA14578@kroah.com> (raw)
In-Reply-To: <20080526121820.03d27324.sfr@canb.auug.org.au>

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

      reply	other threads:[~2008-05-26  6:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-26  2:18 linux-next: driver-core/i2c merge conflicts Stephen Rothwell
2008-05-26  6:05 ` Greg KH [this message]

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=20080526060546.GA14578@kroah.com \
    --to=greg@kroah.com \
    --cc=khali@linux-fr.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).