[GIT] pull request: DMA hwmod changes
G, Manjunath Kondaiah
manjugk at ti.com
Mon Dec 20 23:49:38 EST 2010
On Mon, Dec 20, 2010 at 07:48:36PM -0800, Tony Lindgren wrote:
> * G, Manjunath Kondaiah <manjugk at 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.
> > 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.
More information about the linux-arm-kernel