From: nsekhar@ti.com (Sekhar Nori)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 01/02] DaVinci EDMA clean-up for v3.16
Date: Tue, 27 May 2014 13:40:18 +0530 [thread overview]
Message-ID: <5384486A.4030006@ti.com> (raw)
In-Reply-To: <20140526215858.GU27093@quad.lixom.net>
On Tuesday 27 May 2014 03:28 AM, Olof Johansson wrote:
> This had a conflict with the fix from Thomas that fixes the binding. To
> avoid this, you could have merged Vinod's branch in on top of the fix branch
> you had, then build your new contents on top.
I did notice the conflict, but did not think about merging my fixes
branch in.
> Anyway, not a huge deal, but something to tweak in the future.
Thanks. Will keep in mind.
Regards,
Sekhar
prev parent reply other threads:[~2014-05-27 8:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-24 9:43 [GIT PULL 01/02] DaVinci EDMA clean-up for v3.16 Sekhar Nori
2014-05-24 9:43 ` [GIT PULL 02/02] DaVinci board changes " Sekhar Nori
2014-05-26 21:44 ` Olof Johansson
2014-05-26 21:43 ` [GIT PULL 01/02] DaVinci EDMA clean-up " Olof Johansson
2014-05-26 21:58 ` Olof Johansson
2014-05-27 8:10 ` Sekhar Nori [this message]
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=5384486A.4030006@ti.com \
--to=nsekhar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).