Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599Ab3H0JqM (ORCPT ); Tue, 27 Aug 2013 05:46:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:12705 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078Ab3H0JqK (ORCPT ); Tue, 27 Aug 2013 05:46:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,967,1367996400"; d="scan'208";a="387029920" Date: Tue, 27 Aug 2013 14:31:12 +0530 From: Vinod Koul To: Guennadi Liakhovetski Cc: linux-sh@vger.kernel.org, Magnus Damm , linux-kernel@vger.kernel.org, Kuninori Morimoto , Simon Horman Subject: Re: [PATCH] DMA: shdma: fix a bad merge - remove free_irq() Message-ID: <20130827090112.GT2748@intel.com> References: <20130826135308.GP2748@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1608 Lines: 42 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/