Hi, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> writes: > On Mon, Jun 19, 2017 at 09:41:31AM +0300, Felipe Balbi wrote: >> >> Hi Greg, >> >> here's my pull request for the current merge window. Patches have been >> in linux-next for a while and there's time for them to soak a little >> more. >> >> Note that you're gonna get a conflict when merging this on >> f_mass_storage, you should use the version coming from my tree which was >> authored by Alan Stern. Let me know if you need further details on this. > > Ok, I think I got this right (git checkout --theirs is what I used), but > if you could verify it, that would be great. Checked against greg/usb-testing and it's all good. -- balbi
Attachment:
signature.asc
Description: PGP signature
