Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT

From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT
Date	2016-03-02 12:30 +0100
Message-ID	<r8d8D-6UP-23@gated-at.bofh.it> (permalink)
References	<r59Xz-6rQ-5@gated-at.bofh.it> <r6orz-2jv-77@gated-at.bofh.it> <r8cvT-6qw-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v10 0/5] MT8173 IOMMU SUPPORT Yong Wu <yong.wu@mediatek.com> - 2016-02-23 02:30 +0100
  [PATCH v10 4/5] iommu/mediatek: Add mt8173 IOMMU driver Yong Wu <yong.wu@mediatek.com> - 2016-02-23 02:30 +0100
  Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Joerg Roedel <joro@8bytes.org> - 2016-02-25 17:00 +0100
    Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Philipp Zabel <p.zabel@pengutronix.de> - 2016-02-26 10:00 +0100
      Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Joerg Roedel <joro@8bytes.org> - 2016-02-26 12:10 +0100
        Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Philipp Zabel <p.zabel@pengutronix.de> - 2016-02-26 16:50 +0100
        Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Matthias Brugger <matthias.bgg@gmail.com> - 2016-03-02 11:50 +0100
          Re: [PATCH v10 0/5] MT8173 IOMMU SUPPORT Arnd Bergmann <arnd@arndb.de> - 2016-03-02 12:30 +0100

csiph-web