From: Vinod Koul <vinod.koul@intel.com>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
linux-kernel@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Simon Horman <horms@verge.net.au>
Subject: Re: [PATCH] DMA: shdma: fix a bad merge - remove free_irq()
Date: Tue, 27 Aug 2013 09:13:12 +0000 [thread overview]
Message-ID: <20130827090112.GT2748@intel.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1308271028500.11515@axis700.grange>
On Tue, Aug 27, 2013 at 11:21:00AM +0200, Guennadi Liakhovetski wrote:
> Hi Vinod,
>
> On Mon, 26 Aug 2013, Vinod Koul wrote:
>
> > On Mon, Aug 26, 2013 at 02:27:51PM +0200, Guennadi Liakhovetski wrote:
> > > A bad merge resulted in a left-over free_irq() call. This patch removes it.
> > Applied, thanks
> >
> > Can you also test this branch and see if anything is remaining
> >
> > And can you take care then ARM patches in last serries are merged this week...
>
> Ok, I wanted to just test -next, but the latest is still of 22 Aug and
> that's too old. So, I took the current sh-mobile tree and merged your
> tree on top. There was 1 merge conflict in arch/arm/Makefile, but that's
> unrelated. After doing that I've discovered the following problems:
>
> 1. you applied a wrong version (v1) of my patch "DMA: shdma: support the
> new CHCLR register layout" - not v2, whose patchwork ID I provided:
>
> > DMA: shdma: support the new CHCLR register layout
> > pw ID: 2825593
I have redone the topic branch picking the v2 patch
> I suggest to revert that commit and apply the correct one.
>
> 2. you missed this patch:
>
> > DMA: shdma: move two macros to a header
> > pw ID: 2831934
>
> Please, pick it up too, even though it's just a cosmetic one.
I ahve fixed that up in merge, pls verfiy. So need need of update patch which
you sent..
~Vinod
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vinod.koul@intel.com>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
linux-kernel@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Simon Horman <horms@verge.net.au>
Subject: Re: [PATCH] DMA: shdma: fix a bad merge - remove free_irq()
Date: Tue, 27 Aug 2013 14:31:12 +0530 [thread overview]
Message-ID: <20130827090112.GT2748@intel.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1308271028500.11515@axis700.grange>
On Tue, Aug 27, 2013 at 11:21:00AM +0200, Guennadi Liakhovetski wrote:
> Hi Vinod,
>
> On Mon, 26 Aug 2013, Vinod Koul wrote:
>
> > On Mon, Aug 26, 2013 at 02:27:51PM +0200, Guennadi Liakhovetski wrote:
> > > A bad merge resulted in a left-over free_irq() call. This patch removes it.
> > Applied, thanks
> >
> > Can you also test this branch and see if anything is remaining
> >
> > And can you take care then ARM patches in last serries are merged this week...
>
> Ok, I wanted to just test -next, but the latest is still of 22 Aug and
> that's too old. So, I took the current sh-mobile tree and merged your
> tree on top. There was 1 merge conflict in arch/arm/Makefile, but that's
> unrelated. After doing that I've discovered the following problems:
>
> 1. you applied a wrong version (v1) of my patch "DMA: shdma: support the
> new CHCLR register layout" - not v2, whose patchwork ID I provided:
>
> > DMA: shdma: support the new CHCLR register layout
> > pw ID: 2825593
I have redone the topic branch picking the v2 patch
> I suggest to revert that commit and apply the correct one.
>
> 2. you missed this patch:
>
> > DMA: shdma: move two macros to a header
> > pw ID: 2831934
>
> Please, pick it up too, even though it's just a cosmetic one.
I ahve fixed that up in merge, pls verfiy. So need need of update patch which
you sent..
~Vinod
next prev parent reply other threads:[~2013-08-27 9:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-26 12:27 [PATCH] DMA: shdma: fix a bad merge - remove free_irq() Guennadi Liakhovetski
2013-08-26 12:27 ` Guennadi Liakhovetski
2013-08-26 13:53 ` Vinod Koul
2013-08-26 14:05 ` Vinod Koul
2013-08-27 9:21 ` Guennadi Liakhovetski
2013-08-27 9:21 ` Guennadi Liakhovetski
2013-08-27 9:01 ` Vinod Koul [this message]
2013-08-27 9:13 ` Vinod Koul
2013-08-27 14:46 ` Guennadi Liakhovetski
2013-08-27 14:46 ` Guennadi Liakhovetski
2013-08-28 5:49 ` Vinod Koul
2013-08-28 6:01 ` Vinod Koul
2013-08-28 7:18 ` Guennadi Liakhovetski
2013-08-28 7:18 ` Guennadi Liakhovetski
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=20130827090112.GT2748@intel.com \
--to=vinod.koul@intel.com \
--cc=g.liakhovetski@gmx.de \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.