Subject: Re: linux-next: manual merge of the rr tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 5 Jan 2009 10:30:36 +1100

Hi Greg,

On Mon, 22 Dec 2008 17:32:13 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the rr tree got a conflict in
> drivers/virtio/virtio_pci.c between commit
> b5146336e3bc3786712919e94106063036dae86b ("virtio: do not statically
> allocate root device") from the driver-core tree and commits
> f53dba3a1ea82dfb37f094a942ae74032413809f ("virtio: struct device -
> replace bus_id with dev_name(), dev_set_name()") and
> ab4e479d47ceac2fa5bebd5b99d27f01fe0e0c8b ("virtio: add PCI device release
> () function") from the rr tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  Mark, does
> this driver-core patch obsolete the second rr tree patch above?
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> http://www.canb.auug.org.au/~sfr/
> 
> diff --cc drivers/virtio/virtio_pci.c
> index f772cc4,265fdf2..0000000
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@@ -324,7 -343,8 +340,8 @@@ static int __devinit virtio_pci_probe(s
>   	if (vp_dev == NULL)
>   		return -ENOMEM;
>   
>  -	vp_dev->vdev.dev.parent = &virtio_pci_root;
>  +	vp_dev->vdev.dev.parent = virtio_pci_root;
> + 	vp_dev->vdev.dev.release = virtio_pci_release_dev;
>   	vp_dev->vdev.config = &virtio_pci_config_ops;
>   	vp_dev->pci_dev = pci_dev;
>   	INIT_LIST_HEAD(&vp_dev->virtqueues);

This conflict is now between Linus' tree and the driver-core tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/