Re: FAILED: patch "[PATCH] dmaengine: at_xdmac: fix transfer data width in" failed to apply to 4.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Wed, Aug 12, 2015 at 09:05:26AM +0200, Ludovic Desroches wrote:
> On Tue, Aug 11, 2015 at 03:41:59PM -0700, Greg KH wrote:
> > On Tue, Aug 11, 2015 at 11:09:01AM +0200, Ludovic Desroches wrote:
> > > Hi Greg,
> > > 
> > > On Mon, Aug 10, 2015 at 02:27:56PM -0700, gregkh@linuxfoundation.org wrote:
> > > > 
> > > > The patch below does not apply to the 4.1-stable tree.
> > > 
> > > I have tried to cherry-pick it on 4.1.4 and even on the fresh 4.1.5 and I have
> > > no conflict.
> > > 
> > > Can you tell me on top of which commit I have to pick this patch in
> > > order to get the conflict and fix it.
> > 
> > It doesn't apply for me on top of 4.1.5 with a simple 'patch' command:
> > 	$ patch -p1 < ../dmaengine-at_xdmac-fix-transfer-data-width-in-at_xdmac_prep_slave_sg.patch 
> > 	patching file drivers/dma/at_xdmac.c
> > 	Hunk #1 FAILED at 682.
> > 	1 out of 1 hunk FAILED -- saving rejects to file drivers/dma/at_xdmac.c.rej
> > 
> > How did 'cherry-pick' do it better?  Can you send me the result of the
> > git diff after 'cherry-pick' succeeded and I'll look to see what made it
> > work properly...
> 
> It's not the first time I get this behavior.
> 
> $ git-log|head -n1
>  352cb86  Linux 4.1.5  Greg Kroah-Hartman
> $ git cherry-pick 1c8a38b1268a
> [ludo/v4.1.5_xdmac 6807c71] dmaengine: at_xdmac: fix transfer data width
> in at_xdmac_prep_slave_sg()
>  Author: Cyrille Pitchen <cyrille.pitchen@atmel.com>
>  Date: Tue Jun 30 14:36:57 2015 +0200
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> Patch attached.

Thanks, now applied.

greg k-h