linux-kernel - linux-next: manual merge of the drm-msm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <ZnmTtQyxH6hFGmO-@sirena.org.uk>
Date: Mon, 24 Jun 2024 16:41:41 +0100
From: Mark Brown <broonie@...nel.org>
To: Rob Clark <robdclark@...il.com>, Sean Paul <seanpaul@...omium.org>
Cc: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
	Bjorn Andersson <andersson@...nel.org>,
	Connor Abbott <cwabbott0@...il.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Rob Clark <robdclark@...omium.org>
Subject: linux-next: manual merge of the drm-msm tree with the qcom tree

Hi all,

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

  include/linux/firmware/qcom/qcom_scm.h

between commits:

  158ed777e330e ("firmware: qcom: scm: Add gpu_init_regs call")
  178e19c0df1b1 ("firmware: qcom: scm: add support for SHM bridge operations")

from the qcom tree and commit:

  90c3e2bc9ecbf ("firmware: qcom_scm: Add gpu_init_regs call")

from the drm-msm 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.

diff --cc include/linux/firmware/qcom/qcom_scm.h
index 9f14976399ab8,a221a643dc12a..0000000000000
--- a/include/linux/firmware/qcom/qcom_scm.h
+++ b/include/linux/firmware/qcom/qcom_scm.h

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)