From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754044Ab0G1NiI (ORCPT ); Wed, 28 Jul 2010 09:38:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1765 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753604Ab0G1NiG (ORCPT ); Wed, 28 Jul 2010 09:38:06 -0400 Date: Wed, 28 Jul 2010 16:32:31 +0300 From: "Michael S. Tsirkin" To: David Miller Cc: kvm@vger.kernel.org, virtualization@lists.osdl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, krkumar2@in.ibm.com Subject: [GIT PULL net-next-2.6] vhost-net patchset for 2.6.36 Message-ID: <20100728133231.GA1932@redhat.com> References: <20100701164127.GA3199@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100701164127.GA3199@redhat.com> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org David, The following tree includes the current vhost-net patchset. Please merge it for 2.6.36. Thanks! The following changes since commit 4cfa580e7eebb8694b875d2caff3b989ada2efac: r6040: Fix args to phy_mii_ioctl(). (2010-07-21 21:10:49 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next David Stevens (1): vhost-net: mergeable buffers support Michael S. Tsirkin (1): vhost: apply cgroup to vhost workers Sridhar Samudrala (1): cgroups: Add an API to attach a task to current task's cgroup Tejun Heo (1): vhost: replace vhost_workqueue with per-vhost kthread drivers/vhost/net.c | 293 +++++++++++++++++++++++++++++++++++++++++------- drivers/vhost/vhost.c | 228 ++++++++++++++++++++++++++++++++----- drivers/vhost/vhost.h | 55 ++++++--- include/linux/cgroup.h | 7 + kernel/cgroup.c | 23 ++++ 5 files changed, 515 insertions(+), 91 deletions(-)