From: Tony Lindgren <tony@atomide.com>
To: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Cc: linux-omap@vger.kernel.org, h-kanigeri2@ti.com
Subject: Re: [GIT PULL] omap iommu: for-next for 2.6.35-rc1
Date: Fri, 2 Jul 2010 12:04:11 +0300 [thread overview]
Message-ID: <20100702090411.GH6632@atomide.com> (raw)
In-Reply-To: <20100702.093534.115912504.Hiroshi.DOYU@nokia.com>
* Hiroshi DOYU <Hiroshi.DOYU@nokia.com> [100702 09:29]:
>
> Do you have any plan for pulling for-next patches?
>
> I have some "omap iommu" and "omap mailbox" patches for for-next. Now
> the merge window seems so small and I don't want to miss it.
Pulled now into omap-for-linus for the next merge window. Sorry
for the delay.
BTW, I did not add that Makefile fix into omap-fixes-for-linus,
I figured we should first make sure to get the pending fixes
in, and then maybe do another set of fixes.
But looks like that's in your for-next, so we might as well
keep it there. If there's urgent need to get that in as a fix,
let me know ASAP, I can still rebuild omap-for-linus as that's
the only set merged there.
Regards,
Tony
> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:
> >
> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)
> >
> > are available in the git repository at:
> > git://gitorious.org/~doyu/lk/mainline.git v2.6.35-rc3-iommu-for-next
> >
> > Hiroshi DOYU (4):
> > omap iommu: Introduce iopgd_is_table MACRO
> > omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr
> > omap iommu: move iommu_disable at fault to the above layer
> > omap iommu: Make omap-iommu.o built-in
> >
> > Kanigeri, Hari (3):
> > omap iommu: update irq mask to be specific about twl and tlb
> > omap iommu: add functionality to get TLB miss interrupt
> > omap iommu: update ducati mmu irq define name
> >
> > arch/arm/mach-omap2/Makefile | 5 +++-
> > arch/arm/mach-omap2/iommu2.c | 44 ++++++++++++++++++++++++------
> > arch/arm/mach-omap2/omap-iommu.c | 2 +-
> > arch/arm/plat-omap/include/plat/iommu.h | 2 +
> > arch/arm/plat-omap/iommu.c | 27 ++++++++++++++++---
> > arch/arm/plat-omap/iopgtable.h | 8 +++--
> > 6 files changed, 70 insertions(+), 18 deletions(-)
next prev parent reply other threads:[~2010-07-02 9:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-02 7:50 [GIT PULL] omap iommu: for-next for 2.6.35-rc1 Hiroshi DOYU
2010-06-02 10:01 ` Felipe Balbi
2010-06-02 11:06 ` Hiroshi DOYU
2010-06-02 11:07 ` Felipe Balbi
2010-06-29 4:57 ` Hiroshi DOYU
2010-07-02 6:35 ` Hiroshi DOYU
2010-07-02 9:04 ` Tony Lindgren [this message]
2010-07-02 9:42 ` Hiroshi DOYU
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=20100702090411.GH6632@atomide.com \
--to=tony@atomide.com \
--cc=Hiroshi.DOYU@nokia.com \
--cc=h-kanigeri2@ti.com \
--cc=linux-omap@vger.kernel.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).