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>] [day] [month] [year] [list]
Message-ID: <20200317093151.2b2aa227@canb.auug.org.au>
Date:   Tue, 17 Mar 2020 09:31:51 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andy Gross <agross@...nel.org>, Shawn Guo <shawnguo@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Li Yang <leoyang.li@....com>,
        Bjorn Andersson <bjorn.andersson@...aro.org>
Subject: linux-next: manual merge of the qcom tree with the imx-mxs tree

Hi all,

Today's linux-next merge of the qcom tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  97c1ed02f765 ("arm64: defconfig: Enable PHY devices used on QorIQ boards")

from the imx-mxs tree and commit:

  1788e7a93207 ("arm64: defconfig: Enable Qualcomm SDM845 audio configs")

from the qcom tree.

I fixed it up (see below) 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

diff --cc arch/arm64/configs/defconfig
index 8a7e1bea71ba,d74d237498d8..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -792,12 -763,13 +803,14 @@@ CONFIG_QCOM_SYSMON=
  CONFIG_RPMSG_QCOM_GLINK_RPM=y
  CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
+ CONFIG_SOUNDWIRE=m
+ CONFIG_SOUNDWIRE_QCOM=m
  CONFIG_OWL_PM_DOMAINS=y
  CONFIG_RASPBERRYPI_POWER=y
 +CONFIG_FSL_DPAA=y
 +CONFIG_FSL_MC_DPIO=y
  CONFIG_IMX_SCU_SOC=y
  CONFIG_QCOM_AOSS_QMP=y
 -CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_GLINK_SSR=m
  CONFIG_QCOM_RMTFS_MEM=m
@@@ -892,7 -866,9 +906,10 @@@ CONFIG_FPGA_REGION=
  CONFIG_OF_FPGA_REGION=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
 +CONFIG_MUX_MMIO=y
+ CONFIG_SLIMBUS=m
+ CONFIG_SLIM_QCOM_CTRL=m
+ CONFIG_SLIM_QCOM_NGD_CTRL=m
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ