From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <joro@8bytes•org>, Russell King <rmk@armlinux•org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the iommu tree with the arm tree
Date: Mon, 20 Jun 2016 13:20:09 +1000 [thread overview]
Message-ID: <20160620132009.4e2c0e32@canb.auug.org.au> (raw)
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.
These are clearly 2 versions of the same patch.
I fixed it up (I assumed that tha iommu tree version was newer and used
that) 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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-06-20 3:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 3:20 Stephen Rothwell [this message]
2016-06-20 8:02 ` linux-next: manual merge of the iommu tree with the arm tree Russell King
-- 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=20160620132009.4e2c0e32@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=joro@8bytes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@armlinux$(echo .)org.uk \
/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