From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EF80C432BE for ; Mon, 26 Jul 2021 16:40:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21DC760F55 for ; Mon, 26 Jul 2021 16:40:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239845AbhGZQAJ (ORCPT ); Mon, 26 Jul 2021 12:00:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:43820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239785AbhGZP6I (ORCPT ); Mon, 26 Jul 2021 11:58:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 80EAE60EB2; Mon, 26 Jul 2021 16:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627317517; bh=T5gtnG56UyEdqLhML5SDWuzR5PbDuAxCfdJhsOmPVLM=; h=From:To:Cc:Subject:Date:From; b=QYyePFs2iFNe9oEF6vt+NZWww3yixpMeY2poxxc25XMmRSjbC3Y7NHdESTrCiUQe3 BJwAUeiF/Im+GvXihQfOWCFTzIXGJbNAxzQVm8RO3zPl18ZzQFKzCNLrFCICkXbg1h +5CG7EIJIyuiccyHxek8+1gZi0H1pJqZeOh0wdsOIn96EnEFpNPNh+aycoezwHT20X iGCBKJT6J+kVzdza6hhGDA5j7SjJ+mb2/knM93sPhcwIVwhhXMrLkNEPhm3J5qn7a+ u1D1V/0ZJrd5BQ81AZHIANdKFBbnUcKa5HqjyyDgwrRWU4pnFXq9cWgzxvMUMF8Ivm DsVOrXIh+fi4w== From: Mark Brown To: Dave Airlie , DRI Cc: Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann , Javier Martinez Canillas , John Stultz Subject: linux-next: manual merge of the drm tree with the qcom/for-next tree Date: Mon, 26 Jul 2021 17:38:14 +0100 Message-Id: <20210726163814.6483-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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