Re: [PATCH for-4.20] spi: bcm2835: Unbreak the build of esoteric configs

[Lukas Wunner <lukas@xxxxxxxxx>]

On Thu, Nov 29, 2018 at 03:31:05PM +0000, Mark Brown wrote:
> On Thu, Nov 29, 2018 at 03:14:49PM +0100, Lukas Wunner wrote:
> > Unfortunately the commit was applied despite prior warning that it needs
> > to be respun:
> > https://marc.info/?l=linux-spi&m=154186019626675&w=2
> 
> Sorry about that, I started scanning the changelog when it hit
> discussion about doing a more involved fix for -next - it's good to draw
> attention to reasons not to merge the patch a bit more prominently as it
> helps avoid things like that.

NHNF.  Feel free to squash the patch into the commit it fixes if you like.
Same for the "Polish transfer of DMA prologue" patch.

(A note regarding the latter patch, I've realized that it won't apply
cleanly to your for-4.21 branch because I based it on a branch which
had the "Unbreak the build" patch already applied.  It will apply
cleanly if you change the type of the dma_pending flag back to bool
in the 2nd hunk.  Sorry for the confusion.  Shout if you'd prefer me
to resend.)

Thanks,

Lukas