From: Greg KH <gregkh@linuxfoundation.org>
To: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: cyrille.pitchen@atmel.com, nicolas.ferre@atmel.com,
vinod.koul@intel.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] dmaengine: at_xdmac: fix transfer data width in" failed to apply to 4.1-stable tree
Date: Tue, 11 Aug 2015 15:41:59 -0700 [thread overview]
Message-ID: <20150811224159.GB4475@kroah.com> (raw)
In-Reply-To: <20150811090901.GG2635@odux.rfo.atmel.com>
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...
thanks,
greg k-h
next prev parent reply other threads:[~2015-08-11 22:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 21:27 FAILED: patch "[PATCH] dmaengine: at_xdmac: fix transfer data width in" failed to apply to 4.1-stable tree gregkh
2015-08-11 9:09 ` Ludovic Desroches
2015-08-11 22:41 ` Greg KH [this message]
2015-08-12 7:05 ` Ludovic Desroches
2015-08-13 21:12 ` Greg KH
2015-08-14 8:01 ` Ludovic Desroches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150811224159.GB4475@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=cyrille.pitchen@atmel.com \
--cc=ludovic.desroches@atmel.com \
--cc=nicolas.ferre@atmel.com \
--cc=stable@vger.kernel.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).