From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <jroedel@suse•de>
Cc: Greg KH <greg@kroah•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Rob Herring <robh@kernel•org>,
Jacopo Mondi <jacopo+renesas@jmondi•org>,
Simon Horman <horms+renesas@verge•net.au>,
Magnus Damm <damm+renesas@opensource•se>
Subject: Re: linux-next: manual merge of the driver-core tree with the iommu tree
Date: Sun, 19 Aug 2018 10:28:27 +1000 [thread overview]
Message-ID: <20180819102827.17365759@canb.auug.org.au> (raw)
In-Reply-To: <20180711131445.7e1e211b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]
Hi all,
On Wed, 11 Jul 2018 13:14:45 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/iommu/ipmmu-vmsa.c
>
> between commits:
>
> 0b8ac1409641 ("iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code")
> 3701c123e1c1 ("iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code")
> 98dbffd39a65 ("iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code")
>
> from the iommu tree and commit:
>
> ac6bbf0cdf42 ("iommu: Remove IOMMU_OF_DECLARE")
>
> from the driver-core tree.
>
> I fixed it up (I removed the new IOMMU_OF_DECLARE() lines) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.
This is now a conflict between Linus' tree and the iommu tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-08-19 0:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 3:14 linux-next: manual merge of the driver-core tree with the iommu tree Stephen Rothwell
2018-07-11 10:58 ` Greg KH
2018-08-19 0:28 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-17 16:09 broonie
2023-04-18 6:21 ` Greg KH
2014-05-28 7:55 Stephen Rothwell
2014-05-28 18:35 ` Greg KH
2013-02-06 5:25 Stephen Rothwell
2013-02-06 6:03 ` Greg KH
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=20180819102827.17365759@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=damm+renesas@opensource$(echo .)se \
--cc=greg@kroah$(echo .)com \
--cc=horms+renesas@verge$(echo .)net.au \
--cc=jacopo+renesas@jmondi$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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