Hi Felipe,

On Thu, Jul 26, 2018 at 01:51:35PM +0300, Felipe Balbi wrote:

Eugeniu Rosca [off-list ref] writes:

quoted

From: Andreas Pape <redacted>

Via p_chmask/c_chmask the user can define whether uac2 shall support
playback and/or capture. This has only effect on the created ALSA device,
but not on the USB descriptor. This patch adds playback/capture descriptors
dependent on that parameter.

Signed-off-by: Andreas Pape <redacted>
Signed-off-by: Eugeniu Rosca <redacted>

unfortunately doesn't apply:

checking file drivers/usb/gadget/function/f_uac2.c
Hunk #13 FAILED at 678.
1 out of 14 hunks FAILED

Please rebase on testing/next after a couple hours

I've checked the reason for which you are experiencing the conflict and
what I can see is that your testing/next branch [1] (currently based on 
v4.18-rc6) lacks two uac2 fixes which already reached vanilla master via
v4.18-rc6+ merge commit [2]:

$ git log --oneline --right-only --cherry-pick \
  balbi/testing/next..linux/master drivers/usb/gadget/function/f_uac2.c
eec24f2a0d4d usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3'
e87581fe0509 usb: gadget: f_uac2: fix error handling in afunc_bind (again)

So, the conflicts are caused by an older state of testing/next
relative to mainline. If I rebase [3] on top of [1], you will then face
additional conflicts when rebasing [1] on top of v4.18.

Let me know if we are on the same page.

Best regards,
Eugeniu.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git/log/?h=testing/next
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cd3f77d74ac3
[3] https://patchwork.kernel.org/patch/10480073/
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html