From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Fri, 14 Nov 2008 15:20:54 +1100 > I guess the way forward (easiest for me :-)) is for Rusty's tree to use > netdev_priv() in that one last place in virtio_net.c and for Dave to > apply a patch to his tree that reverts just the virtio_net.c part of the > conflicting commit. > > I think that will remove any conflict between the trees. Thoughts? I'm open to just about anything that doesn't involve rebasing my tree :) -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
