From: Mark Brown <broonie@kernel.org>
To: Tony Lindgren <tony@atomide.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the omap tree with Linus' tree
Date: Tue, 17 Sep 2019 12:52:00 +0100 [thread overview]
Message-ID: <20190917115200.GD3524@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 912 bytes --]
Hi all,
Today's linux-next merge of the omap tree got a conflict in:
arch/arm/mach-omap2/Makefile
between commit:
3846a3b9511c51 ("ommu/omap: fix boot issue on remoteprocs with AMMU/Unicache")
from Linus' tree and commit:
0a55bff7003967 ("Trivial merge conflict between omap and iommu branches.")
from the omap tree.
I fixed it up (see below, dropping the OMAP change) 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.
diff --cc arch/arm/mach-omap2/Makefile
index 8f208197988fe,8253112a4e51e..0000000000000
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-17 11:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 11:52 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-05 0:54 linux-next: manual merge of the omap tree with Linus' tree Stephen Rothwell
2025-11-05 1:28 ` Kevin Hilman
2025-11-05 3:39 ` Stephen Rothwell
2009-10-30 0:46 Stephen Rothwell
2009-10-30 14:46 ` Tony Lindgren
2009-10-31 4:31 ` Stephen Rothwell
2009-10-30 0:46 Stephen Rothwell
2009-10-30 14:45 ` Tony Lindgren
2009-10-31 4:30 ` 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=20190917115200.GD3524@sirena.co.uk \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tony@atomide.com \
/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