iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Joerg Roedel <joro@8bytes.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, iommu@lists.linux-foundation.org,
	Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>,
	Frank Rowand <frowand.list@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 0/5] iommu: Add Allwinner H6 IOMMU driver
Date: Thu, 14 May 2020 18:22:35 +0200	[thread overview]
Message-ID: <20200514162235.he2q7vx3dra5ck2l@gilmour.lan> (raw)
In-Reply-To: <20200514131647.GK18353@8bytes.org>


[-- Attachment #1.1: Type: text/plain, Size: 1737 bytes --]

Hi,

On Thu, May 14, 2020 at 03:16:47PM +0200, Joerg Roedel wrote:
> On Thu, May 14, 2020 at 03:09:00PM +0200, Maxime Ripard wrote:
> > On Thu, May 14, 2020 at 02:38:55PM +0200, Joerg Roedel wrote:
> > > On Wed, May 13, 2020 at 04:07:19PM +0200, Maxime Ripard wrote:
> > > > Maxime Ripard (5):
> > > >   dt-bindings: iommu: Add Allwinner H6 IOMMU bindings
> > > >   dt-bindings: display: sun8i-mixer: Allow for an iommu property
> > > >   iommu: Add Allwinner H6 IOMMU driver
> > > >   arm64: dts: allwinner: h6: Add IOMMU
> > > >   drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU
> > > 
> > > Applied all to the IOMMU tree, thanks. The code lives in the
> > > arm/allwinner branch.
> > 
> > Did you also merge the DTS and DRM patches?
> > 
> > Ideally, they should be merged through other trees to avoid the conflicts as
> > much as possible (arm-soc and drm-misc respectively).
> > 
> > If it's an option, could you drop all of them but "dt-bindings: iommu: Add
> > Allwinner H6 IOMMU bindings" and "iommu: Add Allwinner H6 IOMMU driver"?
> 
> Okay, just to be on the safe side, I am going to drop:
> 
> 	dt-bindings: display: sun8i-mixer: Allow for an iommu property
> 	arm64: dts: allwinner: h6: Add IOMMU
> 	drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU
> 
> from the iommu-tree?

Yep, please :)

> I took them because you are also maintaining the DRM driver, which
> counted as an implicit ACK for me :)

I also maintain the DTS patches for that matter, but we have a good number of
patches queued up for those files in those trees usually, so it's easier for
everyone to avoid the conflicts and just merge them into separate trees when we
can.

Thanks!
Maxime

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 156 bytes --]

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

      reply	other threads:[~2020-05-14 16:22 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-13 14:07 [PATCH v4 0/5] iommu: Add Allwinner H6 IOMMU driver Maxime Ripard
2020-05-13 14:07 ` [PATCH v4 1/5] dt-bindings: iommu: Add Allwinner H6 IOMMU bindings Maxime Ripard
2020-05-13 14:07 ` [PATCH v4 2/5] dt-bindings: display: sun8i-mixer: Allow for an iommu property Maxime Ripard
2020-05-13 14:07 ` [PATCH v4 3/5] iommu: Add Allwinner H6 IOMMU driver Maxime Ripard
2020-05-13 14:07 ` [PATCH v4 4/5] arm64: dts: allwinner: h6: Add IOMMU Maxime Ripard
2020-05-13 14:07 ` [PATCH v4 5/5] drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU Maxime Ripard
2020-05-15  8:15   ` Paul Kocialkowski
2020-05-14 12:38 ` [PATCH v4 0/5] iommu: Add Allwinner H6 IOMMU driver Joerg Roedel
2020-05-14 13:09   ` Maxime Ripard
2020-05-14 13:16     ` Joerg Roedel
2020-05-14 16:22       ` Maxime Ripard [this message]

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=20200514162235.he2q7vx3dra5ck2l@gilmour.lan \
    --to=maxime@cerno.tech \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    /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).