Hi Stephen/Rusty,

On Mon, 2008-12-22 at 18:28 +1030, Rusty Russell wrote:

On Monday 22 December 2008 17:02:13 Stephen Rothwell wrote:

quoted

Hi Rusty,

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?

The conflict resolution is correct.

This is not unexpected.  Mark sent me those two, the others went to
Greg.  I'm happy to ack them and send them on to Greg.

You could do that, or let Stephen carry the fixup or pull these bits
from Greg's tree into your before NEXT_PATCHES_START:

  http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/driver-core/driver-core-add-root_device_register.patch
  http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/driver-core/virtio-do-not-statically-allocate-root-device.patch

Thanks,
Mark.