*** SUBJECT HERE ***
Subsystems (3)
Valentina Manea
maintainercover *** SUBJECT HERE ***
After migrating userspace code to libudev, converting usbip-host to a device driver and various bug fixes and enhancements, USB/IP is fully functional and can be moved out of staging.
This patch series moves it as following:
* userspace code to tools/usb/usbip
* kernel code to drivers/usb/usbip
A warning generated in the kernel code is also solved and an entry in MAINTAINERS file is created for this driver.
Valentina Manea (4):
usbip: move usbip userspace code out of staging
usbip: move usbip kernel code out of staging
usbip: remove struct usb_device_id table
MAINTAINERS: Add an entry for USB/IP driver
MAINTAINERS | 8 +++++++
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/usb/Kconfig | 2 ++
drivers/usb/Makefile | 2 ++
drivers/{staging => usb}/usbip/Kconfig | 0
drivers/{staging => usb}/usbip/Makefile | 0
drivers/{staging => usb}/usbip/README | 0
drivers/{staging => usb}/usbip/stub.h | 0
drivers/{staging => usb}/usbip/stub_dev.c | 27 ----------------------
drivers/{staging => usb}/usbip/stub_main.c | 0
drivers/{staging => usb}/usbip/stub_rx.c | 0
drivers/{staging => usb}/usbip/stub_tx.c | 0
drivers/{staging => usb}/usbip/usbip_common.c | 0
drivers/{staging => usb}/usbip/usbip_common.h | 2 +-
drivers/{staging => usb}/usbip/usbip_event.c | 0
drivers/{staging => usb}/usbip/usbip_protocol.txt | 0
drivers/{staging => usb}/usbip/vhci.h | 0
drivers/{staging => usb}/usbip/vhci_hcd.c | 0
drivers/{staging => usb}/usbip/vhci_rx.c | 0
drivers/{staging => usb}/usbip/vhci_sysfs.c | 0
drivers/{staging => usb}/usbip/vhci_tx.c | 0
.../usbip/uapi => include/uapi/linux}/usbip.h | 0
.../usbip/userspace => tools/usb/usbip}/.gitignore | 0
.../usbip/userspace => tools/usb/usbip}/AUTHORS | 0
.../usbip/userspace => tools/usb/usbip}/COPYING | 0
.../usbip/userspace => tools/usb/usbip}/INSTALL | 0
.../userspace => tools/usb/usbip}/Makefile.am | 0
.../usbip/userspace => tools/usb/usbip}/README | 0
.../usbip/userspace => tools/usb/usbip}/autogen.sh | 0
.../usbip/userspace => tools/usb/usbip}/cleanup.sh | 0
.../userspace => tools/usb/usbip}/configure.ac | 0
.../userspace => tools/usb/usbip}/doc/usbip.8 | 0
.../userspace => tools/usb/usbip}/doc/usbipd.8 | 0
.../usb/usbip}/libsrc/Makefile.am | 0
.../userspace => tools/usb/usbip}/libsrc/list.h | 0
.../userspace => tools/usb/usbip}/libsrc/names.c | 0
.../userspace => tools/usb/usbip}/libsrc/names.h | 0
.../usb/usbip}/libsrc/sysfs_utils.c | 0
.../usb/usbip}/libsrc/sysfs_utils.h | 0
.../usb/usbip}/libsrc/usbip_common.c | 0
.../usb/usbip}/libsrc/usbip_common.h | 0
.../usb/usbip}/libsrc/usbip_host_driver.c | 0
.../usb/usbip}/libsrc/usbip_host_driver.h | 0
.../usb/usbip}/libsrc/vhci_driver.c | 0
.../usb/usbip}/libsrc/vhci_driver.h | 0
.../userspace => tools/usb/usbip}/src/Makefile.am | 0
.../userspace => tools/usb/usbip}/src/usbip.c | 0
.../userspace => tools/usb/usbip}/src/usbip.h | 0
.../usb/usbip}/src/usbip_attach.c | 0
.../userspace => tools/usb/usbip}/src/usbip_bind.c | 0
.../usb/usbip}/src/usbip_detach.c | 0
.../userspace => tools/usb/usbip}/src/usbip_list.c | 0
.../usb/usbip}/src/usbip_network.c | 0
.../usb/usbip}/src/usbip_network.h | 0
.../userspace => tools/usb/usbip}/src/usbip_port.c | 0
.../usb/usbip}/src/usbip_unbind.c | 0
.../userspace => tools/usb/usbip}/src/usbipd.c | 0
.../userspace => tools/usb/usbip}/src/utils.c | 0
.../userspace => tools/usb/usbip}/src/utils.h | 0
60 files changed, 13 insertions(+), 31 deletions(-)
rename drivers/{staging => usb}/usbip/Kconfig (100%)
rename drivers/{staging => usb}/usbip/Makefile (100%)
rename drivers/{staging => usb}/usbip/README (100%)
rename drivers/{staging => usb}/usbip/stub.h (100%)
rename drivers/{staging => usb}/usbip/stub_dev.c (90%)
rename drivers/{staging => usb}/usbip/stub_main.c (100%)
rename drivers/{staging => usb}/usbip/stub_rx.c (100%)
rename drivers/{staging => usb}/usbip/stub_tx.c (100%)
rename drivers/{staging => usb}/usbip/usbip_common.c (100%)
rename drivers/{staging => usb}/usbip/usbip_common.h (99%)
rename drivers/{staging => usb}/usbip/usbip_event.c (100%)
rename drivers/{staging => usb}/usbip/usbip_protocol.txt (100%)
rename drivers/{staging => usb}/usbip/vhci.h (100%)
rename drivers/{staging => usb}/usbip/vhci_hcd.c (100%)
rename drivers/{staging => usb}/usbip/vhci_rx.c (100%)
rename drivers/{staging => usb}/usbip/vhci_sysfs.c (100%)
rename drivers/{staging => usb}/usbip/vhci_tx.c (100%)
rename {drivers/staging/usbip/uapi => include/uapi/linux}/usbip.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/.gitignore (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/AUTHORS (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/COPYING (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/INSTALL (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/README (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/autogen.sh (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/cleanup.sh (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/configure.ac (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbip.8 (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbipd.8 (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/list.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_attach.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_bind.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_detach.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_list.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_port.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_unbind.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbipd.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.h (100%)Signature · 1 line
1.8.1.2
Valentina Manea
maintainerPATCH 1/4 usbip: move usbip userspace code out of staging
At this point, USB/IP userspace code is fully functional and can be moved out of staging.
---
{drivers/staging/usbip/userspace => tools/usb/usbip}/.gitignore | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/AUTHORS | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/COPYING | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/INSTALL | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/Makefile.am | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/README | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/autogen.sh | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/cleanup.sh | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/configure.ac | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbip.8 | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbipd.8 | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/Makefile.am | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/list.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.h | 0
.../staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.c | 0
.../staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.h | 0
.../usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.c | 0
.../usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/Makefile.am | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_attach.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_bind.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_detach.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_list.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.h | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_port.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_unbind.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbipd.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.c | 0
{drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.h | 0
37 files changed, 0 insertions(+), 0 deletions(-)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/.gitignore (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/AUTHORS (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/COPYING (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/INSTALL (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/README (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/autogen.sh (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/cleanup.sh (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/configure.ac (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbip.8 (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/doc/usbipd.8 (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/list.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/names.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/sysfs_utils.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_common.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/usbip_host_driver.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/libsrc/vhci_driver.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/Makefile.am (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_attach.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_bind.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_detach.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_list.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_network.h (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_port.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbip_unbind.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/usbipd.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.c (100%)
rename {drivers/staging/usbip/userspace => tools/usb/usbip}/src/utils.h (100%)tools/usb/usbip/.gitignore renamed from drivers/staging/usbip/userspace/.gitignore +0 -0
tools/usb/usbip/AUTHORS renamed from drivers/staging/usbip/userspace/AUTHORS +0 -0
tools/usb/usbip/COPYING renamed from drivers/staging/usbip/userspace/COPYING +0 -0
tools/usb/usbip/INSTALL renamed from drivers/staging/usbip/userspace/INSTALL +0 -0
tools/usb/usbip/Makefile.am renamed from drivers/staging/usbip/userspace/Makefile.am +0 -0
tools/usb/usbip/README renamed from drivers/staging/usbip/userspace/README +0 -0
tools/usb/usbip/autogen.sh renamed from drivers/staging/usbip/userspace/autogen.sh +0 -0
tools/usb/usbip/cleanup.sh renamed from drivers/staging/usbip/userspace/cleanup.sh +0 -0
tools/usb/usbip/configure.ac renamed from drivers/staging/usbip/userspace/configure.ac +0 -0
tools/usb/usbip/doc/usbip.8 renamed from drivers/staging/usbip/userspace/doc/usbip.8 +0 -0
tools/usb/usbip/doc/usbipd.8 renamed from drivers/staging/usbip/userspace/doc/usbipd.8 +0 -0
tools/usb/usbip/libsrc/Makefile.am renamed from drivers/staging/usbip/userspace/libsrc/Makefile.am +0 -0
tools/usb/usbip/libsrc/list.h renamed from drivers/staging/usbip/userspace/libsrc/list.h +0 -0
tools/usb/usbip/libsrc/names.c renamed from drivers/staging/usbip/userspace/libsrc/names.c +0 -0
tools/usb/usbip/libsrc/names.h renamed from drivers/staging/usbip/userspace/libsrc/names.h +0 -0
tools/usb/usbip/libsrc/sysfs_utils.c renamed from drivers/staging/usbip/userspace/libsrc/sysfs_utils.c +0 -0
tools/usb/usbip/libsrc/sysfs_utils.h renamed from drivers/staging/usbip/userspace/libsrc/sysfs_utils.h +0 -0
tools/usb/usbip/libsrc/usbip_common.c renamed from drivers/staging/usbip/userspace/libsrc/usbip_common.c +0 -0
tools/usb/usbip/libsrc/usbip_common.h renamed from drivers/staging/usbip/userspace/libsrc/usbip_common.h +0 -0
tools/usb/usbip/libsrc/usbip_host_driver.c renamed from drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c +0 -0
tools/usb/usbip/libsrc/usbip_host_driver.h renamed from drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h +0 -0
tools/usb/usbip/libsrc/vhci_driver.c renamed from drivers/staging/usbip/userspace/libsrc/vhci_driver.c +0 -0
tools/usb/usbip/libsrc/vhci_driver.h renamed from drivers/staging/usbip/userspace/libsrc/vhci_driver.h +0 -0
tools/usb/usbip/src/Makefile.am renamed from drivers/staging/usbip/userspace/src/Makefile.am +0 -0
tools/usb/usbip/src/usbip.c renamed from drivers/staging/usbip/userspace/src/usbip.c +0 -0
tools/usb/usbip/src/usbip.h renamed from drivers/staging/usbip/userspace/src/usbip.h +0 -0
tools/usb/usbip/src/usbip_attach.c renamed from drivers/staging/usbip/userspace/src/usbip_attach.c +0 -0
tools/usb/usbip/src/usbip_bind.c renamed from drivers/staging/usbip/userspace/src/usbip_bind.c +0 -0
tools/usb/usbip/src/usbip_detach.c renamed from drivers/staging/usbip/userspace/src/usbip_detach.c +0 -0
tools/usb/usbip/src/usbip_list.c renamed from drivers/staging/usbip/userspace/src/usbip_list.c +0 -0
tools/usb/usbip/src/usbip_network.c renamed from drivers/staging/usbip/userspace/src/usbip_network.c +0 -0
tools/usb/usbip/src/usbip_network.h renamed from drivers/staging/usbip/userspace/src/usbip_network.h +0 -0
tools/usb/usbip/src/usbip_port.c renamed from drivers/staging/usbip/userspace/src/usbip_port.c +0 -0
tools/usb/usbip/src/usbip_unbind.c renamed from drivers/staging/usbip/userspace/src/usbip_unbind.c +0 -0
tools/usb/usbip/src/usbipd.c renamed from drivers/staging/usbip/userspace/src/usbipd.c +0 -0
tools/usb/usbip/src/utils.c renamed from drivers/staging/usbip/userspace/src/utils.c +0 -0
tools/usb/usbip/src/utils.h renamed from drivers/staging/usbip/userspace/src/utils.h +0 -0
Signature · 1 line
1.8.1.2
Valentina Manea
maintainerRe: [PATCH 1/4] usbip: move usbip userspace code out of staging
Quoted 4 lines · Valentina Manea
At this point, USB/IP userspace code is fully functional and can be moved out of staging.
Signed-off-by Valentina Manea <[email protected]>
Bumping this in case Greg missed the patch series.
Valentina
Greg KH
maintainerRe: [PATCH 1/4] usbip: move usbip userspace code out of staging
Quoted 8 lines · Valentina Manea
Quoted 4 lines · Valentina Manea
At this point, USB/IP userspace code is fully functional and can be moved out of staging.
Signed-off-by Valentina Manea <[email protected]>Bumping this in case Greg missed the patch series.
My email client doesn't support "bumping", it keeps things in their proper sending order :)
Anyway, I've been traveling, should get to this soon, it's not forgotten...
thanks,
greg k-h
Valentina Manea
maintainerPATCH 2/4 usbip: move usbip kernel code out of staging
In reply to Valentina ManeaAt this point, USB/IP kernel code is fully functional and can be moved out of staging.
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/usb/Kconfig | 2 ++
drivers/usb/Makefile | 2 ++
drivers/{staging => usb}/usbip/Kconfig | 0
drivers/{staging => usb}/usbip/Makefile | 0
drivers/{staging => usb}/usbip/README | 0
drivers/{staging => usb}/usbip/stub.h | 0
drivers/{staging => usb}/usbip/stub_dev.c | 0
drivers/{staging => usb}/usbip/stub_main.c | 0
drivers/{staging => usb}/usbip/stub_rx.c | 0
drivers/{staging => usb}/usbip/stub_tx.c | 0
drivers/{staging => usb}/usbip/usbip_common.c | 0
drivers/{staging => usb}/usbip/usbip_common.h | 2 +-
drivers/{staging => usb}/usbip/usbip_event.c | 0
drivers/{staging => usb}/usbip/usbip_protocol.txt | 0
drivers/{staging => usb}/usbip/vhci.h | 0
drivers/{staging => usb}/usbip/vhci_hcd.c | 0
drivers/{staging => usb}/usbip/vhci_rx.c | 0
drivers/{staging => usb}/usbip/vhci_sysfs.c | 0
drivers/{staging => usb}/usbip/vhci_tx.c | 0
{drivers/staging/usbip/uapi => include/uapi/linux}/usbip.h | 0
22 files changed, 5 insertions(+), 4 deletions(-)
rename drivers/{staging => usb}/usbip/Kconfig (100%)
rename drivers/{staging => usb}/usbip/Makefile (100%)
rename drivers/{staging => usb}/usbip/README (100%)
rename drivers/{staging => usb}/usbip/stub.h (100%)
rename drivers/{staging => usb}/usbip/stub_dev.c (100%)
rename drivers/{staging => usb}/usbip/stub_main.c (100%)
rename drivers/{staging => usb}/usbip/stub_rx.c (100%)
rename drivers/{staging => usb}/usbip/stub_tx.c (100%)
rename drivers/{staging => usb}/usbip/usbip_common.c (100%)
rename drivers/{staging => usb}/usbip/usbip_common.h (99%)
rename drivers/{staging => usb}/usbip/usbip_event.c (100%)
rename drivers/{staging => usb}/usbip/usbip_protocol.txt (100%)
rename drivers/{staging => usb}/usbip/vhci.h (100%)
rename drivers/{staging => usb}/usbip/vhci_hcd.c (100%)
rename drivers/{staging => usb}/usbip/vhci_rx.c (100%)
rename drivers/{staging => usb}/usbip/vhci_sysfs.c (100%)
rename drivers/{staging => usb}/usbip/vhci_tx.c (100%)
rename {drivers/staging/usbip/uapi => include/uapi/linux}/usbip.h (100%)drivers/staging/Kconfig +0 -2
@@ -28,8 +28,6 @@ source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" -source "drivers/staging/usbip/Kconfig" - source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile +0 -1
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING) += staging.o obj-y += media/ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ -obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
drivers/usb/Kconfig +2 -0
@@ -92,6 +92,8 @@ source "drivers/usb/storage/Kconfig" source "drivers/usb/image/Kconfig" +source "drivers/usb/usbip/Kconfig" + endif source "drivers/usb/musb/Kconfig"
drivers/usb/Makefile +2 -0
@@ -60,3 +60,5 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/ obj-$(CONFIG_USB_GADGET) += gadget/ obj-$(CONFIG_USB_COMMON) += common/ + +obj-$(CONFIG_USBIP_CORE) += usbip/
drivers/usb/usbip/Kconfig renamed from drivers/staging/usbip/Kconfig +0 -0
drivers/usb/usbip/Makefile renamed from drivers/staging/usbip/Makefile +0 -0
drivers/usb/usbip/README renamed from drivers/staging/usbip/README +0 -0
drivers/usb/usbip/stub.h renamed from drivers/staging/usbip/stub.h +0 -0
drivers/usb/usbip/stub_dev.c renamed from drivers/staging/usbip/stub_dev.c +0 -0
drivers/usb/usbip/stub_main.c renamed from drivers/staging/usbip/stub_main.c +0 -0
drivers/usb/usbip/stub_rx.c renamed from drivers/staging/usbip/stub_rx.c +0 -0
drivers/usb/usbip/stub_tx.c renamed from drivers/staging/usbip/stub_tx.c +0 -0
drivers/usb/usbip/usbip_common.c renamed from drivers/staging/usbip/usbip_common.c +0 -0
drivers/usb/usbip/usbip_common.h renamed from drivers/staging/usbip/usbip_common.h +1 -1
@@ -29,7 +29,7 @@#include <linux/types.h> #include <linux/usb.h> #include <linux/wait.h> -#include "uapi/usbip.h" +#include <uapi/linux/usbip.h> #define USBIP_VERSION "1.0.0"
drivers/usb/usbip/usbip_event.c renamed from drivers/staging/usbip/usbip_event.c +0 -0
drivers/usb/usbip/usbip_protocol.txt renamed from drivers/staging/usbip/usbip_protocol.txt +0 -0
drivers/usb/usbip/vhci.h renamed from drivers/staging/usbip/vhci.h +0 -0
drivers/usb/usbip/vhci_hcd.c renamed from drivers/staging/usbip/vhci_hcd.c +0 -0
drivers/usb/usbip/vhci_rx.c renamed from drivers/staging/usbip/vhci_rx.c +0 -0
drivers/usb/usbip/vhci_sysfs.c renamed from drivers/staging/usbip/vhci_sysfs.c +0 -0
drivers/usb/usbip/vhci_tx.c renamed from drivers/staging/usbip/vhci_tx.c +0 -0
include/uapi/linux/usbip.h renamed from drivers/staging/usbip/uapi/usbip.h +0 -0
Signature · 1 line
1.8.1.2
Valentina Manea
maintainerPATCH 3/4 usbip: remove struct usb_device_id table
In reply to Valentina ManeaThis was used back when usbip-host was an interface device driver; after the conversion to device driver, the table remained unused. Remove it in order to stop receiving a warning about it.
--- drivers/usb/usbip/stub_dev.c | 27 --------------------------- 1 file changed, 27 deletions(-)
drivers/usb/usbip/stub_dev.c +0 -27
@@ -26,33 +26,6 @@#include "stub.h" /* -* Define device IDs here if you want to explicitly limit exportable devices. -* In most cases, wildcard matching will be okay because driver binding can be -* changed dynamically by a userland program. -*/ -static struct usb_device_id stub_table[] = { -#if 0 -/* just an example */ - {USB_DEVICE (0x05ac ,0x0301 ) },/* Mac 1 button mouse */ - {USB_DEVICE (0x0430 ,0x0009 ) },/* Plat Home Keyboard */ - {USB_DEVICE (0x059b ,0x0001 ) },/* Iomega USB Zip 100 */ - {USB_DEVICE (0x04b3 ,0x4427 ) },/* IBM USB CD-ROM */ - {USB_DEVICE (0x05a9 ,0xa511 ) },/* LifeView USB cam */ - {USB_DEVICE (0x55aa ,0x0201 ) },/* Imation card reader */ - {USB_DEVICE (0x046d ,0x0870 ) },/* Qcam Express(QV-30) */ - {USB_DEVICE (0x04bb ,0x0101 ) },/* IO-DATA HD 120GB */ - {USB_DEVICE (0x04bb ,0x0904 ) },/* IO-DATA USB-ET/TX */ - {USB_DEVICE (0x04bb ,0x0201 ) },/* IO-DATA USB-ET/TX */ - {USB_DEVICE (0x08bb ,0x2702 ) },/* ONKYO USB Speaker */ - {USB_DEVICE (0x046d ,0x08b2 ) },/* Logicool Qcam 4000 Pro */ -#endif -/* magic for wild card */ - { .driver_info =1 }, - {0 , }/* Terminating entry */ -}; -MODULE_DEVICE_TABLE (usb, stub_table); - -/* * usbip_status shows the status of usbip-host as long as this driver is bound * to the target device. */
Signature · 1 line
1.8.1.2
Valentina Manea
maintainerPATCH 4/4 MAINTAINERS: Add an entry for USB/IP driver
In reply to Valentina ManeaThis patch adds an entry in MAINTAINERS file for USB/IP driver.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -9515,6 +9515,14 @@ S: Maintained F: Documentation/usb/ohci.txt F: drivers/usb/host/ohci* +USB OVER IP DRIVER +M: Valentina Manea <[email protected]> +M: Shuah Khan <[email protected]> +L: [email protected] +S: Maintained +F: drivers/usb/usbip/ +F: tools/usb/usbip/ + USB PEGASUS DRIVER M: Petko Manolov <[email protected]> L: [email protected]
Signature · 1 line
1.8.1.2
A message that is not in the archive (sent off-list or not yet received): CAGUYZuSMYQL4ur8sXn_sqdKXxYfYRqsz4kCxsmRY1C0dDbbB2Q@mail.gmail.com
gregkh
maintainerRe: [PATCH 4/4] MAINTAINERS: Add an entry for USB/IP driver
Quoted 5 lines · sanjeev sharma
Hello Valentina,
I have started looking into USB IP Project and this look's very interesting and Do we have anything left in this Project apart from reviewing user-land protocol ?
What do you mean by this? Does the code not work properly for you?
confused,
greg k-h
Greg KH
maintainerQuoted 10 lines · Valentina Manea
After migrating userspace code to libudev, converting usbip-host to a device driver and various bug fixes and enhancements, USB/IP is fully functional and can be moved out of staging.
This patch series moves it as following:
* userspace code totools/usb/usbip
* kernel code todrivers/usb/usbipA warning generated in the kernel code is also solved and an entry in
MAINTAINERSfile is created for this driver.
Looks good, all now queued up, thanks.
greg k-h