linux-next: manual merge of the vhost tree with the net tree

From: Stephen Rothwell
Date: Wed May 30 2012 - 23:14:14 EST

Next message: Ben Greear: "Re: Anyone successfully booted a custom kernel on Fedora 17?"
Previous message: Feng Tang: "[PATCH v3 2/3] perf script: Replace "struct thread" with "struct addr_location" as a parameter for "process_event()""
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
drivers/net/virtio_net.c between commit 3bbf372c6c60 ("virtio-net: remove
useless disable on freeze") from the net tree and commit 53ffd226507a
("virtio-net: remove useless disable on freeze") from the vhost tree.

I just used the version from the net tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Ben Greear: "Re: Anyone successfully booted a custom kernel on Fedora 17?"
Previous message: Feng Tang: "[PATCH v3 2/3] perf script: Replace "struct thread" with "struct addr_location" as a parameter for "process_event()""
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]