Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1574308

linux-next: manual merge of the arm64 tree with the qcom tree

Show all headers | View 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the arm64 tree with the qcom tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-06 00:30 +0100
  Re: linux-next: manual merge of the arm64 tree with the qcom tree Will Deacon <will.deacon@arm.com> - 2017-02-06 12:50 +0100
    Re: linux-next: manual merge of the arm64 tree with the qcom tree Andy Gross <andy.gross@linaro.org> - 2017-02-06 16:50 +0100

csiph-web