summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-08 05:05:13 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-08 05:05:26 +0200
commit6e06c0e2347ec79d0bd5702b2438fe883f784545 (patch)
tree3f55976275c94822cd406e7edc549f668901affa /net/core
parentnet: IP_MULTICAST_IF setsockopt now recognizes struct mreq (diff)
parentvhost: zerocopy: poll vq in zerocopy callback (diff)
downloadlinux-6e06c0e2347ec79d0bd5702b2438fe883f784545.tar.xz
linux-6e06c0e2347ec79d0bd5702b2438fe883f784545.zip
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Michael S. Tsirkin says: -------------------- There are mostly bugfixes here. I hope to merge some more patches by 3.5, in particular vlan support fixes are waiting for Eric's ack, and a version of tracepoint patch might be ready in time, but let's merge what's ready so it's testable. This includes a ton of zerocopy fixes by Jason - good stuff but too intrusive for 3.4 and zerocopy is experimental anyway. virtio supported delayed interrupt for a while now so adding support to the virtio tool made sense -------------------- Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions