| Message ID | 20101213104413.GA678@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Dec 13, 2010 at 12:44:13PM +0200, Michael S. Tsirkin wrote: > Please merge the following tree for 2.6.38. > Thanks! Um, I sent this out before I noticed the mail from Rusty with some questions on the test code. I missed that and assumed no comments -> no issues, perhaps wrongly. Rusty - I tried answering the questions there - any issues with merging this? It's just a test so won't be hard to remove later if it's not helpful ... > The following changes since commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0: > > net: au1000_eth: remove unused global variable. (2010-12-11 12:01:48 -0800) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next > > Jason Wang (1): > vhost: fix typos in comment > > Julia Lawall (1): > drivers/vhost/vhost.c: delete double assignment > > Michael S. Tsirkin (9): > vhost: put mm after thread stop > vhost-net: batch use/unuse mm > vhost: copy_to_user -> __copy_to_user > vhost: get/put_user -> __get/__put_user > vhost: remove unused include > vhost: correctly set bits of dirty pages > vhost: better variable name in logging > vhost test module > tools/virtio: virtio_test tool > > drivers/vhost/net.c | 9 +- > drivers/vhost/test.c | 320 ++++++++++++++++++++++++++++++++++ > drivers/vhost/test.h | 7 + > drivers/vhost/vhost.c | 44 +++--- > drivers/vhost/vhost.h | 2 +- > tools/virtio/Makefile | 12 ++ > tools/virtio/linux/device.h | 2 + > tools/virtio/linux/slab.h | 2 + > tools/virtio/linux/virtio.h | 223 +++++++++++++++++++++++ > tools/virtio/vhost_test/Makefile | 2 + > tools/virtio/vhost_test/vhost_test.c | 1 + > tools/virtio/virtio_test.c | 248 ++++++++++++++++++++++++++ > 12 files changed, 842 insertions(+), 30 deletions(-) > create mode 100644 drivers/vhost/test.c > create mode 100644 drivers/vhost/test.h > create mode 100644 tools/virtio/Makefile > create mode 100644 tools/virtio/linux/device.h > create mode 100644 tools/virtio/linux/slab.h > create mode 100644 tools/virtio/linux/virtio.h > create mode 100644 tools/virtio/vhost_test/Makefile > create mode 100644 tools/virtio/vhost_test/vhost_test.c > create mode 100644 tools/virtio/virtio_test.c -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 14 Dec 2010 03:54:47 am Michael S. Tsirkin wrote: > On Mon, Dec 13, 2010 at 12:44:13PM +0200, Michael S. Tsirkin wrote: > > Please merge the following tree for 2.6.38. > > Thanks! > > Um, I sent this out before I noticed the mail from Rusty > with some questions on the test code. I missed that and > assumed no comments -> no issues, perhaps wrongly. > > Rusty - I tried answering the questions there - any issues > with merging this? It's just a test so won't be hard to remove > later if it's not helpful ... Traditionally this stuff has not gone in tree. However, I think it should be... Rusty. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 13, 2010 at 12:44:13PM +0200, Michael S. Tsirkin wrote: > Please merge the following tree for 2.6.38. > Thanks! Rusty Acked it as is, so please pull the below. Thanks very much! > The following changes since commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0: > > net: au1000_eth: remove unused global variable. (2010-12-11 12:01:48 -0800) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next > > Jason Wang (1): > vhost: fix typos in comment > > Julia Lawall (1): > drivers/vhost/vhost.c: delete double assignment > > Michael S. Tsirkin (9): > vhost: put mm after thread stop > vhost-net: batch use/unuse mm > vhost: copy_to_user -> __copy_to_user > vhost: get/put_user -> __get/__put_user > vhost: remove unused include > vhost: correctly set bits of dirty pages > vhost: better variable name in logging > vhost test module > tools/virtio: virtio_test tool > > drivers/vhost/net.c | 9 +- > drivers/vhost/test.c | 320 ++++++++++++++++++++++++++++++++++ > drivers/vhost/test.h | 7 + > drivers/vhost/vhost.c | 44 +++--- > drivers/vhost/vhost.h | 2 +- > tools/virtio/Makefile | 12 ++ > tools/virtio/linux/device.h | 2 + > tools/virtio/linux/slab.h | 2 + > tools/virtio/linux/virtio.h | 223 +++++++++++++++++++++++ > tools/virtio/vhost_test/Makefile | 2 + > tools/virtio/vhost_test/vhost_test.c | 1 + > tools/virtio/virtio_test.c | 248 ++++++++++++++++++++++++++ > 12 files changed, 842 insertions(+), 30 deletions(-) > create mode 100644 drivers/vhost/test.c > create mode 100644 drivers/vhost/test.h > create mode 100644 tools/virtio/Makefile > create mode 100644 tools/virtio/linux/device.h > create mode 100644 tools/virtio/linux/slab.h > create mode 100644 tools/virtio/linux/virtio.h > create mode 100644 tools/virtio/vhost_test/Makefile > create mode 100644 tools/virtio/vhost_test/vhost_test.c > create mode 100644 tools/virtio/virtio_test.c -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Michael S. Tsirkin" <mst@redhat.com> Date: Tue, 14 Dec 2010 14:23:26 +0200 > On Mon, Dec 13, 2010 at 12:44:13PM +0200, Michael S. Tsirkin wrote: >> Please merge the following tree for 2.6.38. >> Thanks! > > Rusty Acked it as is, so please pull the below. > Thanks very much! > >> The following changes since commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0: >> >> net: au1000_eth: remove unused global variable. (2010-12-11 12:01:48 -0800) >> >> are available in the git repository at: >> git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next Pulled, thanks a lot. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Please merge the following tree for 2.6.38. Thanks! The following changes since commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0: net: au1000_eth: remove unused global variable. (2010-12-11 12:01:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next Jason Wang (1): vhost: fix typos in comment Julia Lawall (1): drivers/vhost/vhost.c: delete double assignment Michael S. Tsirkin (9): vhost: put mm after thread stop vhost-net: batch use/unuse mm vhost: copy_to_user -> __copy_to_user vhost: get/put_user -> __get/__put_user vhost: remove unused include vhost: correctly set bits of dirty pages vhost: better variable name in logging vhost test module tools/virtio: virtio_test tool drivers/vhost/net.c | 9 +- drivers/vhost/test.c | 320 ++++++++++++++++++++++++++++++++++ drivers/vhost/test.h | 7 + drivers/vhost/vhost.c | 44 +++--- drivers/vhost/vhost.h | 2 +- tools/virtio/Makefile | 12 ++ tools/virtio/linux/device.h | 2 + tools/virtio/linux/slab.h | 2 + tools/virtio/linux/virtio.h | 223 +++++++++++++++++++++++ tools/virtio/vhost_test/Makefile | 2 + tools/virtio/vhost_test/vhost_test.c | 1 + tools/virtio/virtio_test.c | 248 ++++++++++++++++++++++++++ 12 files changed, 842 insertions(+), 30 deletions(-) create mode 100644 drivers/vhost/test.c create mode 100644 drivers/vhost/test.h create mode 100644 tools/virtio/Makefile create mode 100644 tools/virtio/linux/device.h create mode 100644 tools/virtio/linux/slab.h create mode 100644 tools/virtio/linux/virtio.h create mode 100644 tools/virtio/vhost_test/Makefile create mode 100644 tools/virtio/vhost_test/vhost_test.c create mode 100644 tools/virtio/virtio_test.c -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html