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

[Mark Brown]

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.

diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 3c2af2e98def..5ced0673d94b 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -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