From patchwork Mon Jul 26 16:38:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 485848 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3996310jao; Mon, 26 Jul 2021 09:38:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx48PK5qi+jEl1p5irEpyDPTiJZ0EmaOxDkScqoplm4ayWWhHQPXsM9vZpioTt4VeJ0x/2D X-Received: by 2002:a63:1214:: with SMTP id h20mr18710655pgl.355.1627317521569; Mon, 26 Jul 2021 09:38:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627317521; cv=none; d=google.com; s=arc-20160816; b=mLyJmqXqHYUVvvXx4JVZV8kszyR/YhSUsW56DqUN/9WGIbNes0FS9plkNyaqHgaEOX 6/G5oxF92Iq0AbVtdsKSBZNO5DG7e1RGw32tw5RrDkXIRvBlCnq6pXSarPtV6c7ejEGx SUmkRqvZNTaz91166BzSdLQWRPk9B+Wt6L/JOHXX56EqHAp0uUv2W5zMbMDgS5MpG3ub 2fvCMTLYQjhGGdCfyT5tK6xPCev8u07oab5BuX0WtcAtIq7szV+UoF6KkT7kiR5e5dcw cMQowy4WQW7pw2lGyya9i4vIuXmFw69LnETOn08WInVHA4fEWTLaFKblT8lp0QK8QEdQ 0f2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :delivered-to; bh=ukmQjyO8uR3sVrSGJoPyLTtXZRUvc9rW7qXpyCebs68=; b=0RkAAsedb3qHIoV6EQLvRJIVBGhLyIJ6BClLWOdKCU79UptCdm4YWff5/oC8y4o9I3 ur+fTt6EUZRtUDxqjAcsb2/woVSJ2TBskFVL0qDhFW1ymMgmmtHMdu3zA+bHeDovzJML Hi6P/MWcudeKV+9ey2T7TMu+3GdJxMp83Uo3m/AtVrGrKW2fxd7kEX9E7xRvah6zT8Av d/BnI2/ud7u0aOJVIJCMqA5bhHSD7n7Z24JdcuxM1PohRQ3nuHCdmKvaCRZH7Kz3prUh x1QEVXPykNlO46bI64DR1234v+5vTeKLocjGOo9GNmSkvmCdnhBy4tghizhxaa9iDwZ1 NnlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=QYyePFs2; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id c6si457861pls.355.2021.07.26.09.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 09:38:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=QYyePFs2; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF45172E79; Mon, 26 Jul 2021 16:38:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3541F72E79 for ; Mon, 26 Jul 2021 16:38:37 +0000 (UTC) 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 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Javier Martinez Canillas , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann , Bjorn Andersson Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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