From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Subject: Re: dmaengine 3.13 v2 Date: Tue, 19 Nov 2013 17:10:37 -0800 Message-ID: References: <20131116065213.GI8834@intel.com> <20131117162813.GJ8834@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <20131117162813.GJ8834@intel.com> Sender: linux-raid-owner@vger.kernel.org To: Vinod Koul Cc: Linus Walleij , Andy Shevchenko , Dave Jiang , linux-raid , Jon Mason , "dmaengine@vger.kernel.org" , Bartlomiej Zolnierkiewicz List-Id: linux-raid.ids On Sun, Nov 17, 2013 at 8:28 AM, Vinod Koul wrote: > On Sat, Nov 16, 2013 at 10:37:38AM -0800, Dan Williams wrote: >> On Nov 15, 2013 11:48 PM, "Vinod Koul" wrote: >> >> > While the dmaengine-v2 has: >> > >> > commit 82a1402eaee5dab1f3ab2d5aa4c316451374c5af >> > Author: Ezequiel Garcia >> > Date: Wed Oct 30 12:01:43 2013 -0300 >> > >> > Which also explains the diff I got with test. I have pushed my merge to >> > dan_merge2 for your ref. You next branch also doesnt show this commit and >> these >> > are missing below. I guess we need this for the fix. Looks like you tagged >> > without these patches. I can go ahead and merge commit >> > bad6f9dba84e7ddc448f306ce4b289dcaa95b9f9 directly if you want. >> >> No, use the tag directly. We're still sorting those ntb patches out >> internally and I accidentally included them in the test branch. > Fine, I have pushed now as next, pls do verify > Sorry, didn't reply to this. The merge looks good. I did notice that the merge message says "Merge commit 'dmaengine-3.13-v2'" rather than "Merge tag 'dmaengine-3.13-v2'". Not a big deal, but may want to check your git version supports pulling signed tags. Thanks Vinod!