linux-next: manual merge of the drm tree with the qcom/for-next tree

PATCH Mark Brown 2 participants 2 messages Jul 26, 2021 – Sep 2, 2021 Linux-next tree

lore

Share & tools

lore

Mark Brown

author maintainer

2021-07-26 16:38 UTC #0 lore raw

Hi all,

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

drivers/firmware/Makefile

between commit:

b42000e4b874 ("firmware: qcom_scm: Allow qcom_scm driver to be loadable as a permenent module")

from the qcom/for-next tree and commits:

8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup for all arches") d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support")

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

drivers/firmware/Makefile +2 -0

index 3c2af2e98def..5ced0673d94b 100644
@@ -19,6 +19,8 @@ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
 obj-$(CONFIG_FW_CFG_SYSFS)	+= qemu_fw_cfg.o
 obj-$(CONFIG_QCOM_SCM)		+= qcom-scm.o
 qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o
+obj-$(CONFIG_SYSFB)		+= sysfb.o
+obj-$(CONFIG_SYSFB_SIMPLEFB)	+= sysfb_simplefb.o
 obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o
 obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o
 obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o

Stephen Rothwell

2021-09-02 01:44 UTC #1 lore raw

Hi all,

Quoted 28 lines · On Mon, 26 Jul 2021 17:38:14 +0100 Mark Brown <[email protected]> wrote:

Today's linux-next merge of the drm tree got a conflict in:
drivers/firmware/Makefile
between commit:
b42000e4b874 ("firmware: qcom_scm: Allow qcom_scm driver to be loadable as a permenent module")
from the qcom/for-next tree and commits:
8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup for all arches") d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support")
from the drm 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.
drivers/firmware/Makefile +0 -0
index 3c2af2e98def..5ced0673d94b 100644

drivers/firmware/Makefile obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o · line 26

Quoted 8 lines

drivers/firmware/Makefile +2 -0

@@ -19,6 +19,8 @@ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
 obj-$(CONFIG_FW_CFG_SYSFS)	+= qemu_fw_cfg.o
 obj-$(CONFIG_QCOM_SCM)		+= qcom-scm.o
 qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o
+obj-$(CONFIG_SYSFB)		+= sysfb.o
+obj-$(CONFIG_SYSFB_SIMPLEFB)	+= sysfb_simplefb.o
 obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o
 obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o
 obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o

This is now a conflict between the arm-soc tree and Linus' tree.

Signature · 2 lines

Cheers,
Stephen Rothwell