From: manjugk@ti.com (G, Manjunath Kondaiah)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT] pull request: DMA hwmod changes
Date: Tue, 21 Dec 2010 10:19:38 +0530 [thread overview]
Message-ID: <20101221044938.GA21531@manju-desktop> (raw)
In-Reply-To: <20101221034836.GE5829@atomide.com>
On Mon, Dec 20, 2010 at 07:48:36PM -0800, Tony Lindgren wrote:
> Hi,
>
> * G, Manjunath Kondaiah <manjugk@ti.com> [101220 18:11]:
> > Hi Tony,
> > Benoit comments are taken care and new pull request is generated as
> > below. The omap4 hwmod database for dma is rearranged as per Benoit's
> > convention + no idlest flag entry is removed + sysc_flags are barrowed
> > from latest omap4 hwmod data base.
>
> OK great, I've applied them now.
Thanks.
>
> > The following changes since commit 205e4d6e8d892176d791b77a974efe7f561ca4c3:
> >
> > Merge branch 'for-next' (2010-12-17 19:32:47 -0800)
>
> I ended up cherry picking them. For next time, note that you should not
> do any git branches to pull against anything but mainline tags. Otherwise
> tons of non-mainline history would get merged..
ok. Since you mentioned in one of previous mail that, you will be
merging these changes to l-o master for testing hence I generated pull
request against l-o master.
>
> If you cannot base your branch on some recent mainline tag because of
> conflicts, then you should use some branch that will stay around,
> like what we have queued into omap-for-linus.
ok. Will do this in future.
-Manjunath
prev parent reply other threads:[~2010-12-21 4:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-19 3:59 [GIT] pull request: DMA hwmod changes G, Manjunath Kondaiah
2010-12-20 10:45 ` Cousson, Benoit
2010-12-21 2:11 ` G, Manjunath Kondaiah
2010-12-21 3:48 ` Tony Lindgren
2010-12-21 4:49 ` G, Manjunath Kondaiah [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=20101221044938.GA21531@manju-desktop \
--to=manjugk@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).