Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3700024pxv; Mon, 26 Jul 2021 09:42:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkHNKCMX8RQRSyKyDkGZAdDi/b78PRJNMWNEFIqFQfTXfoubuNG4PzO3s9aW0L5B8MzbPj X-Received: by 2002:a17:906:b53:: with SMTP id v19mr17286384ejg.262.1627317744043; Mon, 26 Jul 2021 09:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627317744; cv=none; d=google.com; s=arc-20160816; b=TySvQgIX/Mwc7csU7Z57xHRHX0wzEkroBKdsBUN2kFVldt7Io7gV8O4bnAD5YQzZfG Z6Bz3poBW0PTjjqRD+i0hulz62pXaVxU/pM4HVxMQP/Y8db9UQboOl0aR4jz/jw4UWGd skZokdJYnyOicbGs9218z2Iti5GyTkKXp2J6uIZVArTM3sg1uThdllab/5HmavgkouoT m4GzhSoHfU+fLg3RIvvTElcd1jlzbnH1+iQ6WKcqL6erd0TjmEv14cpTwnQ88ObPx9y/ tjOm+56OewZOgT+ykznwn2tgdqQ26LEVPzDxfsv0jts6SEC1JICI+IzDJ/TZrc2pYI3Z SyZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ukmQjyO8uR3sVrSGJoPyLTtXZRUvc9rW7qXpyCebs68=; b=L9vy0ir7Hm+W6UYY9GGfMYZ/7Ed1LuoL6xH6beHo1ggUZMmnqWUmDMVlJZdGAOHEdE 1BscFgd9ngPdR/139J3qOYxiSd4uYVIOqW04NzXnJ8/VW+5sFGvRyXNOwpxHav0HeKOb oxSvnCU2ciRB/u4Q+F2Qbrp+gPFLpvpMOd2Padx72yORRV6yfAxXDGHsaiSrdQ4Q6/ys 67Q78IaesLlprER3kcHR4z7T4kG2Imj9qpZcasX8+j6/uJeUfwgCtDofSbhpWPMdbUuL ZBLdmroFYmb8PrvnR7AxKmr14IHrtATtC57UegNAVWo+AvQYLh0MiRXnLjwFI1XW93RR AH+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QYyePFs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x33si405107edy.214.2021.07.26.09.41.58; Mon, 26 Jul 2021 09:42:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QYyePFs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239886AbhGZQAI (ORCPT + 99 others); Mon, 26 Jul 2021 12:00:08 -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