Skip to contentSkip to conversation

virtio fixes

GIT PULL Rusty Russell 1 participant 1 message May 22, 2013

lore
Share & tools
lore
#0 lore raw

The following changes since commit d5fe85af85367d5892e4308f596de4e2a5fb9017:

Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2013-05-16 15:12:34 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git tags/fixes-for-linus

for you to fetch changes up to 6407d75afd08545f2252bb39806ffd3f10c7faac:

virtio_console: fix uapi header (2013-05-20 10:25:28 +0930)

----------------------------------------------------------------
A build fix and a uapi exposure fix. The build fix is later than I liked, but my first version broke linux-next due to overzealous header clean.

Thanks,
Rusty.

----------------------------------------------------------------
Michael S. Tsirkin (1):
virtio_console: fix uapi header

Rusty Russell (1):
Hoist memcpy_fromiovec/memcpy_toiovec into lib/

 drivers/misc/vmw_vmci/Kconfig           |  2 +-
 drivers/misc/vmw_vmci/vmci_queue_pair.c |  2 +-
 include/linux/socket.h                  |  2 --
 include/linux/uio.h                     |  3 ++
 include/uapi/linux/virtio_console.h     |  2 +-
 lib/Makefile                            |  2 +-
 lib/iovec.c                             | 53 +++++++++++++++++++++++++++++++++
 net/core/iovec.c                        | 50 -------------------------------
 8 files changed, 60 insertions(+), 56 deletions(-)
 create mode 100644 lib/iovec.c