From: Russell King <rmk@armlinux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the iommu tree with the arm tree
Date: Mon, 20 Jun 2016 09:02:59 +0100 [thread overview]
Message-ID: <20160620080259.GJ22276@flint.armlinux.org.uk> (raw)
In-Reply-To: <20160620132009.4e2c0e32@canb.auug.org.au>
On Mon, Jun 20, 2016 at 01:20:09PM +1000, Stephen Rothwell wrote:
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/iommu/mtk_iommu.c
>
> between commit:
>
> d267804c8457 ("iommu: convert DT component matching to component_match_add_release()")
>
> from the arm tree and commit:
>
> da4d6e6d3b3e ("iommu/mediatek: Convert DT component matching to component_match_add_release()")
>
> from the iommu tree.
This looks like it's going to end up being broken. I self-NACK'd my v2
patch series was, and it looks like the v2 patch was picked up instead
of v1.
It's also part of a _three_ patch series, where the _second two_ patches
depend on the _first_ patch. Such series can't be split up.
--
Russell King
ARM architecture Linux Kernel maintainer
next prev parent reply other threads:[~2016-06-20 8:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 3:20 linux-next: manual merge of the iommu tree with the arm tree Stephen Rothwell
2016-06-20 8:02 ` Russell King [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-28 3:13 Stephen Rothwell
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=20160620080259.GJ22276@flint.armlinux.org.uk \
--to=rmk@armlinux.org.uk \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).