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 S1755163AbcCBL15 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 2 Mar 2016 06:27:57 -0500
Received: from mout.kundenserver.de ([217.72.192.73]:63100 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754355AbcCBL1z (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 2 Mar 2016 06:27:55 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joerg Roedel <joro@8bytes.org>, Philipp Zabel <p.zabel@pengutronix.de>,
        arm@kernel.org, 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, mitchelh@codeaurora.org, youhua.li@mediatek.com,
        kendrick.hsu@mediatek.com
Subject: Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT
Date: Wed, 02 Mar 2016 12:26:35 +0100
Message-ID: <15221728.nr4S7fgC2l@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <56D6C50B.3040108@gmail.com>
References: <1456161651-6136-1-git-send-email-yong.wu@mediatek.com> <20160226110633.GE22747@8bytes.org> <56D6C50B.3040108@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:UWJkiocFdzsIOXIOJyIyQjk9As1ghUnf9JrIHqfvckVbZSlX7Sh
 ZKJgTNT+jOym8r8u0SoMrkPDaB8ludb1MBzp9+jzaeQTsiwe2OTQRtdhkp6TZ26BvakcZ18
 Fik9bqTA+8acH8PDZP1SBftn51WnsF15h0F25XpRmqinPh6MnhrqtP2UOTDs2unB8wWy0if
 2UKtZsBM9NIZilPyp9lGA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:C2BWWN7DMro=:SsK+BSGzzP/vvFKpmXsdAm
 6YiSHECtVihnOqQnjvv11FxJDChFlraKB+Y13ICC4Md/NTLfwXJa7HunNnxF7hBD2kc/d9nf0
 64CxwarFbqhIBBHzBCd36HNf/CNjh16VfwEHDi9DCyM6vQw21mcwZXImAlq4x2EG+MC9bfGtW
 xfjbMzOCE5E2JOCAXuNssdoz8ksLy6zt7sMm1vEV5GNyI8SC3MmhGVvJL+z0An+VDUhADkmtv
 e5HuLcxtskNBoOl/STw5Nyqv5tQevtxUiSYvvL89/YnWPLX41wXrMRb5W2+zX8lvYTjJLvJO8
 LiagZlaTccoBJ5Qv/t10AcvsDwIgHv+g4qadJjTTN2/MU5XEvWuhKQzAjHoHktvfimUOjjJTn
 kxuMDaG3ZuRsHvTu5uSPbGYpAOq1QXhKE1mLXICC2JqVcfms8+1H7aAmaGnewRCGxy/mpqkKV
 ht+xFW2Exwdr88Xn/MIhwZ7q1llw7RmZEor1cFyBqL+pY1f79SzQjM1VOXbvO6uata+56p/w7
 8qquQ3g4j5B0H3kCbuDeImvJWDfGGlgsiusqkMQ77Wq7VZ27cFVGjU2wa47UmT3xFo5MSeHZd
 97ENZuUzH9Z56dwI74xX5V+vHGPCldicrG69WMyQyOsIst9/vJ0VPCmBEE1TYU+mmy2VPnAYr
 xyAXd0+dwiy5TMdqt5M0GuV7Pm6/ANfpWlKcapAQpdczGY3A7jbxew58GMzAw8QWkzDNOwn5O
 DILZG1Ot+DpcbMRB
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wednesday 02 March 2016 11:48:43 Matthias Brugger wrote:
> 
> 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?

I think this time, we can live with the conflict, it's easy enough
to resolve when Linus pulls both branches.

	Arnd