From: Matthias Brugger <matthias.bgg@gmail.com>
To: Joerg Roedel <joro@8bytes.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
arm@kernel.org
Cc: Yong Wu <yong.wu@mediatek.com>,
Thierry Reding <treding@nvidia.com>,
Mark Rutland <mark.rutland@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Will Deacon <will.deacon@arm.com>,
Daniel Kurtz <djkurtz@google.com>, Tomasz Figa <tfiga@google.com>,
Lucas Stach <l.stach@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-mediatek@lists.infradead.org,
Sasha Hauer <kernel@pengutronix.de>,
srv_heupstream@mediatek.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, pebolle@tiscali.nl,
arnd@arndb.de, mitchelh@codeaurora.org, youhua.li@mediatek.com,
kendrick.hsu@mediatek.com
Subject: Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT
Date: Wed, 2 Mar 2016 11:48:43 +0100 [thread overview]
Message-ID: <56D6C50B.3040108@gmail.com> (raw)
In-Reply-To: <20160226110633.GE22747@8bytes.org>
Hi Arnd and Olof,
On 26/02/16 12:06, Joerg Roedel wrote:
> Hi Philipp,
>
> On Fri, Feb 26, 2016 at 09:55:55AM +0100, Philipp Zabel wrote:
>> Do you have a stable branch that I could base the mediatek-drm patches
>> on and that I may include in a pull request to be merged via drm-next?
>
> You can base it on the arm/mediatek branch of the iommu tree. I'll push
> it out in the next minutes.
>
I realized that Joerg accidentally merged the dts parts as well through
his branch.
As expected this patches conflict when merging the arm-soc tree.
Shall Joerg drops the patches and you take it through your branch, or
I queue them for the next release cycle?
Regards,
Matthias
next prev parent reply other threads:[~2016-03-02 10:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 17:20 [PATCH v10 0/5] MT8173 IOMMU SUPPORT Yong Wu
2016-02-22 17:20 ` [PATCH v10 1/5] dt-bindings: iommu: Add binding for mediatek IOMMU Yong Wu
2016-02-22 17:20 ` [PATCH v10 2/5] dt-bindings: mediatek: Add smi dts binding Yong Wu
2016-02-22 17:20 ` [PATCH v10 3/5] memory: mediatek: Add SMI driver Yong Wu
2016-02-22 17:20 ` [PATCH v10 4/5] iommu/mediatek: Add mt8173 IOMMU driver Yong Wu
2016-02-22 17:20 ` [PATCH v10 5/5] dts: mt8173: Add iommu/smi nodes for mt8173 Yong Wu
2016-02-25 15:50 ` [PATCH v10 0/5] MT8173 IOMMU SUPPORT Joerg Roedel
2016-02-26 8:55 ` Philipp Zabel
2016-02-26 11:06 ` Joerg Roedel
2016-02-26 15:49 ` Philipp Zabel
2016-03-02 10:48 ` Matthias Brugger [this message]
2016-03-02 11:26 ` Arnd Bergmann
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=56D6C50B.3040108@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=djkurtz@google.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kendrick.hsu@mediatek.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=mitchelh@codeaurora.org \
--cc=p.zabel@pengutronix.de \
--cc=pebolle@tiscali.nl \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=treding@nvidia.com \
--cc=will.deacon@arm.com \
--cc=yong.wu@mediatek.com \
--cc=youhua.li@mediatek.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