From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>,
Andy Gross <andy.gross@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Will Deacon <will.deacon@arm.com>
Subject: linux-next: manual merge of the arm64 tree with the qcom tree
Date: Mon, 6 Feb 2017 10:23:29 +1100 [thread overview]
Message-ID: <20170206102329.04879df9@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm64 tree got conflicts in:
arch/arm/kernel/armksyms.c
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/smccc-call.S
include/linux/arm-smccc.h
between commits:
0a0c5b832751 ("arm: kernel: Add SMC structure parameter")
9c96e7f72029 ("firmware: qcom: scm: Fix interrupted SCM calls")
from the qcom tree and commits:
680a0873e193 ("arm: kernel: Add SMC structure parameter")
82bcd087029f ("firmware: qcom: scm: Fix interrupted SCM calls")
from the arm64 tree.
I fixed it up (please check the final resolution when it is released,
or fix these up) 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:[~2017-02-05 23:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-05 23:23 Stephen Rothwell [this message]
2017-02-06 11:44 ` linux-next: manual merge of the arm64 tree with the qcom tree Will Deacon
2017-02-06 15:45 ` Andy Gross
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=20170206102329.04879df9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andy.gross@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=will.deacon@arm.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