Re: linux-next: build failure after merge of the asm-generic tree

From: Bin Liu
Date: Thu Mar 15 2018 - 18:47:50 EST


Hi,

On Fri, Mar 16, 2018 at 09:13:55AM +1100, Stephen Rothwell wrote:
> Hi Arnd,
>
> After merging the asm-generic tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/usb/musb/musb_host.c: In function 'musb_rx_reinit':
> drivers/usb/musb/musb_host.c:577:10: error: 'struct musb' has no member named 'double_buffer_not_ok'
> if (musb->double_buffer_not_ok)
> ^~
> drivers/usb/musb/musb_host.c: In function 'musb_ep_program':
> drivers/usb/musb/musb_host.c:807:12: error: 'struct musb' has no member named 'double_buffer_not_ok'
> if (musb->double_buffer_not_ok) {
> ^~
>
> Caused by commit
>
> 8312c0cad792 ("usb: musb: remove blackfin port")

I don't have a clone of the asm-generic tree to check, but this patch
Arnd sent yesterday for review doesn't remove double_buffer_not_ok from
struct musb. Is it removed when Arnd you were revising it based on my
review comments? Anyway, it is better to remove it too since this flag
is Blackfin specific, but...

>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 16 Mar 2018 08:58:41 +1100
> Subject: [PATCH] usb: musb: more blackfin removal
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

...is it possible to combine this fixup patch with the original patch to
avoid bisect headache in the future?

Regards,
-Bin.