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, [email protected] 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...
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
