Subject: Re: linux-next: rr/driver-core merge conflicts

From: Greg KH <[email-masked]>
Date: Thu, 29 May 2008 09:09:44 -0700

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