* linux-next: manual merge of the drm tree with the qcom/for-next tree
@ 2021-07-26 16:38 Mark Brown
2021-09-02 1:44 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2021-07-26 16:38 UTC (permalink / raw)
To: Dave Airlie, DRI
Cc: Bjorn Andersson, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann,
Javier Martinez Canillas, John Stultz
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the drm tree with the qcom/for-next tree
2021-07-26 16:38 linux-next: manual merge of the drm tree with the qcom/for-next tree Mark Brown
@ 2021-09-02 1:44 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-09-02 1:44 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM
Cc: Mark Brown, Dave Airlie, DRI, Bjorn Andersson,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann, Javier Martinez Canillas, John Stultz
[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]
Hi all,
On Mon, 26 Jul 2021 17:38:14 +0100 Mark Brown <broonie@kernel.org> 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.
>
> 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
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-02 1:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26 16:38 linux-next: manual merge of the drm tree with the qcom/for-next tree Mark Brown
2021-09-02 1:44 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).