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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170206102329.04879df9@canb.auug.org.au>
Date:   Mon, 6 Feb 2017 10:23:29 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Catalin Marinas <catalin.marinas@....com>,
        Andy Gross <andy.gross@...aro.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the arm64 tree with the qcom tree

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