linux-next: manual merge of the usb-gadget tree with the usb.current tree

Mon, 12 Jan 2015 20:03:38 -0800 

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit 6b448af46e2a ("drivers: usb: dwc2: remove
'force' parameter from kill_all_requests()") from the usb-gadget tree.

I fixed it up (I used the latter version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgp4bekKVcCQr.pgp
Description: OpenPGP digital signature

Reply via email to