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: Rusty Russell <rusty@rustcorp.com.au>,
	Kay Sievers <kay.sievers@vrfy.org>,
	linux-next@vger.kernel.org
Subject: Re: linux-next: rr/driver-core merge conflicts
Date: Thu, 29 May 2008 09:09:44 -0700	[thread overview]
Message-ID: <20080529160944.GA10595@kroah.com> (raw)
In-Reply-To: <20080529155818.6e298a47.sfr@canb.auug.org.au>

On Thu, May 29, 2008 at 03:58:18PM +1000, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> drivers/virtio/virtio_pci.c between commit
> 6ddd7ce42a7bb3382a8bfb10caa6a5cce321b533 ("driver core: convert to new
> device API to allow names longer than 20 chars") from the driver-core
> tree and commit c77b394544154fdd2fb2211a2106fcc793aaa547
> ("virtio:pci-should-not-set-bus_id") from the rr tree.  The latter
> removes code that the former changed to use dev_set_name().

If it's removed, that's the correct merge.

> The second conflict was in drivers/virtio/virtio.c between the same
> driver-core commit and commit a48130de9ad5da45f6d3035030e1fc975559e0e7
> ("virtio:bus_id-should-contain-virtio-name") from the rr tree.  The
> former did the dev_set_name() change while the latter added "virtio" to
> the name.  I did the obvious.

thanks, that sounds sane.

> Greg, is there some way we could add a version of dev_set_name() to
> current mainline now so that the conversions can be farmed out (or at
> least be done in other trees destined for linux-next)?

Yes, I'll do that today, thanks for the idea.

greg k-h

  reply	other threads:[~2008-05-29 19:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-29  5:58 linux-next: rr/driver-core merge conflicts Stephen Rothwell
2008-05-29 16:09 ` Greg KH [this message]
2008-05-30  0:21   ` dev_set_name (Was: linux-next: rr/driver-core merge conflicts) Stephen Rothwell
2008-05-30  2:37     ` Greg KH
2008-05-30  5:44       ` Stephen Rothwell

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=20080529160944.GA10595@kroah.com \
    --to=greg@kroah.com \
    --cc=kay.sievers@vrfy.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    --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).