From: Tony Lindgren <tony@atomide.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Joerg Roedel <joro@8bytes.org>, Suman Anna <s-anna@ti.com>,
iommu@lists.linux-foundation.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Florian Vaussard <florian.vaussard@epfl.ch>
Subject: Re: [PATCH v2 0/3] iommu: Remove OMAP IOVMM driver
Date: Wed, 23 Jul 2014 23:54:12 -0700 [thread overview]
Message-ID: <20140724065412.GH22006@atomide.com> (raw)
In-Reply-To: <4101565.HEj9dhtF5Z@avalon>
* Laurent Pinchart <laurent.pinchart@ideasonboard.com> [140723 07:02]:
> Hi Joerg,
>
> On Wednesday 23 July 2014 15:52:17 Joerg Roedel wrote:
> > On Mon, Jul 21, 2014 at 11:19:29PM -0700, Tony Lindgren wrote:
> > > > Tony, is there still time to get this (and especially patch 2/3, which
> > > > touches arch/ code) in v3.17 ?
> > >
> > > Yes as long as Joerg is OK to merge that branch in :)
> >
> > Fine with me, I can take only patch 1 or all 3 into my arm/omap branch,
> > given Tony's Acked-by.
> >
> > Then you guys can merge in this branch wherever you want :)
>
> Thank you. Assuming there's currently no conflict to be resolved, I believe
> the easiest would be for both you and Tony to merge my branch in your trees.
Yes please merge that branch via the IOMMU tree, I only need to merge it
if I see merge conflicts with it.
Regards,
Tony
next prev parent reply other threads:[~2014-07-24 6:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 10:49 [PATCH v2 0/3] iommu: Remove OMAP IOVMM driver Laurent Pinchart
[not found] ` <1405680597-10012-1-git-send-email-laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2014-07-18 10:49 ` [PATCH v2 1/3] iommu/omap: Remove virtual memory manager Laurent Pinchart
2014-07-18 10:49 ` [PATCH v2 2/3] ARM: omap: Don't set iommu pdata da_start and da_end fields Laurent Pinchart
2014-07-18 10:49 ` [PATCH v2 3/3] iommu/omap: Remove platform data " Laurent Pinchart
2014-07-18 16:53 ` [PATCH v2 0/3] iommu: Remove OMAP IOVMM driver Suman Anna
2014-07-21 9:14 ` Laurent Pinchart
2014-07-21 9:33 ` Tony Lindgren
[not found] ` <20140721093336.GR18374-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-07-21 18:15 ` Laurent Pinchart
2014-07-22 6:19 ` Tony Lindgren
[not found] ` <20140722061929.GD18374-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-07-22 23:42 ` Laurent Pinchart
2014-07-23 13:52 ` Joerg Roedel
2014-07-23 14:00 ` Laurent Pinchart
2014-07-24 6:54 ` Tony Lindgren [this message]
2014-07-29 10:43 ` Joerg Roedel
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=20140724065412.GH22006@atomide.com \
--to=tony@atomide.com \
--cc=florian.vaussard@epfl.ch \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=s-anna@ti.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).