Re: [GIT PULL] Fixes for 3.2-rc2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Nov 10, 2011 at 10:07:04AM +0200, Felipe Balbi wrote:
> Paul Zimmerman (1):
>       usb: gadget: storage: check for valid USB_BULK_GET_MAX_LUN_REQUEST
> 
> Paul.Zimmerman@xxxxxxxxxxxx (1):
>       usb: gadget: storage: check for valid USB_BULK_RESET_REQUEST wLength

These should both show up under Paul's name, please be sure to check the
emails before committing them.

>  drivers/usb/dwc3/gadget.c              |    1 +
>  drivers/usb/gadget/ci13xxx_msm.c       |    2 +
>  drivers/usb/gadget/ci13xxx_udc.c       |   21 +++--
>  drivers/usb/gadget/f_mass_storage.c    |    6 +-
>  drivers/usb/gadget/f_midi.c            |  138 +++++++++++++++-----------------
>  drivers/usb/gadget/file_storage.c      |    4 +-
>  drivers/usb/gadget/fsl_udc_core.c      |    2 +-
>  drivers/usb/gadget/inode.c             |    5 +-
>  drivers/usb/gadget/r8a66597-udc.c      |   30 +++-----
>  drivers/usb/gadget/udc-core.c          |   10 +-
>  drivers/usb/musb/Kconfig               |    3 +-
>  drivers/usb/musb/am35x.c               |    1 +
>  drivers/usb/musb/da8xx.c               |    1 +
>  drivers/usb/musb/musb_core.c           |    3 +-
>  drivers/usb/musb/musb_gadget.c         |    4 -
>  drivers/usb/renesas_usbhs/common.c     |    2 +-
>  drivers/usb/renesas_usbhs/fifo.c       |    4 +-
>  drivers/usb/renesas_usbhs/mod.h        |    8 +-
>  drivers/usb/renesas_usbhs/mod_gadget.c |    4 +-
>  drivers/usb/renesas_usbhs/mod_host.c   |   63 +++++++++------
>  20 files changed, 160 insertions(+), 152 deletions(-)

Odd, I got:

$ git pull --log  git://gitorious.org/usb/usb.git for-greg
remote: Counting objects: 185, done.
remote: Compressing objects: 100% (59/59), done.
remote: Total 158 (delta 130), reused 124 (delta 99)
Receiving objects: 100% (158/158), 25.06 KiB, done.
Resolving deltas: 100% (130/130), completed with 25 local objects.
>From git://gitorious.org/usb/usb
 * branch            for-greg   -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 drivers/usb/dwc3/gadget.c              |    1 +
 drivers/usb/gadget/ci13xxx_msm.c       |    2 +
 drivers/usb/gadget/ci13xxx_udc.c       |   21 +++--
 drivers/usb/gadget/f_mass_storage.c    |    6 +-
 drivers/usb/gadget/f_midi.c            |  128 +++++++++++++++-----------------
 drivers/usb/gadget/file_storage.c      |    4 +-
 drivers/usb/gadget/fsl_udc_core.c      |    2 +-
 drivers/usb/gadget/inode.c             |    5 +-
 drivers/usb/gadget/r8a66597-udc.c      |   30 +++-----
 drivers/usb/gadget/udc-core.c          |   10 +-
 drivers/usb/musb/Kconfig               |    3 +-
 drivers/usb/musb/am35x.c               |    1 +
 drivers/usb/musb/da8xx.c               |    1 +
 drivers/usb/musb/musb_core.c           |    3 +-
 drivers/usb/musb/musb_gadget.c         |    4 -
 drivers/usb/renesas_usbhs/common.c     |    2 +-
 drivers/usb/renesas_usbhs/fifo.c       |    4 +-
 drivers/usb/renesas_usbhs/mod.h        |    8 +-
 drivers/usb/renesas_usbhs/mod_gadget.c |    4 +-
 drivers/usb/renesas_usbhs/mod_host.c   |   63 ++++++++++------
 20 files changed, 155 insertions(+), 147 deletions(-)


Which looks like f_midi.c is different here.

Hm, I'll just take the raw patches and use those, that way I can fix up
the email issue noted above, please check my tree to ensure I got
everything and try to figure out why I got a different diffstat than you
did.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux