From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754346AbcCBKsv (ORCPT <rfc822;w@1wt.eu>);
	Wed, 2 Mar 2016 05:48:51 -0500
Received: from mail-wm0-f43.google.com ([74.125.82.43]:32814 "EHLO
	mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753350AbcCBKss (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 2 Mar 2016 05:48:48 -0500
Subject: Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT
To: Joerg Roedel <joro@8bytes.org>, Philipp Zabel <p.zabel@pengutronix.de>,
        arm@kernel.org
References: <1456161651-6136-1-git-send-email-yong.wu@mediatek.com>
 <20160225155007.GA19092@8bytes.org> <1456476955.3383.21.camel@pengutronix.de>
 <20160226110633.GE22747@8bytes.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
From: Matthias Brugger <matthias.bgg@gmail.com>
Message-ID: <56D6C50B.3040108@gmail.com>
Date: Wed, 2 Mar 2016 11:48:43 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.6.0
MIME-Version: 1.0
In-Reply-To: <20160226110633.GE22747@8bytes.org>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.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