From: Dan Williams <dan.j.williams@intel.com>
To: Vinod Koul <vinod.koul@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.jf.intel.com>,
Dave Jiang <dave.jiang@intel.com>,
linux-raid <linux-raid@vger.kernel.org>,
Jon Mason <jon.mason@intel.com>,
"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: Re: dmaengine 3.13 v2
Date: Tue, 19 Nov 2013 17:10:37 -0800 [thread overview]
Message-ID: <CAA9_cmf0WoOYjB4n=Gvcm6bMnF-HqvEWf=YpiAbB=wViEaFivA@mail.gmail.com> (raw)
In-Reply-To: <20131117162813.GJ8834@intel.com>
On Sun, Nov 17, 2013 at 8:28 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> On Sat, Nov 16, 2013 at 10:37:38AM -0800, Dan Williams wrote:
>> On Nov 15, 2013 11:48 PM, "Vinod Koul" <vinod.koul@intel.com> wrote:
>>
>> > While the dmaengine-v2 has:
>> >
>> > commit 82a1402eaee5dab1f3ab2d5aa4c316451374c5af
>> > Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
>> > 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!
next prev parent reply other threads:[~2013-11-20 1:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-15 18:33 dmaengine 3.13 v2 Dan Williams
2013-11-16 6:52 ` Vinod Koul
[not found] ` <CAPcyv4iMY84dbZLtZceAKnhbkDP-+Vszss8BYriB9pva6nxCfg@mail.gmail.com>
2013-11-17 16:28 ` Vinod Koul
2013-11-20 1:10 ` Dan Williams [this message]
2013-11-17 22:17 ` Jon Mason
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='CAA9_cmf0WoOYjB4n=Gvcm6bMnF-HqvEWf=YpiAbB=wViEaFivA@mail.gmail.com' \
--to=dan.j.williams@intel.com \
--cc=andriy.shevchenko@linux.jf.intel.com \
--cc=b.zolnierkie@samsung.com \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=jon.mason@intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-raid@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).