mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the drm-msm tree with the qcom tree
@ 2024-06-24 15:41 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2024-06-24 15:41 UTC (permalink / raw)
  To: Rob Clark, Sean Paul
  Cc: Bartosz Golaszewski, Bjorn Andersson, Connor Abbott,
	Linux Kernel Mailing List, Linux Next Mailing List, Rob Clark

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-06-24 15:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-24 15:41 linux-next: manual merge of the drm-msm tree with the qcom tree Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®