From patchwork Thu Sep 28 02:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13401867 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55849E80A8A for ; Thu, 28 Sep 2023 02:06:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BDE310E5CC; Thu, 28 Sep 2023 02:06:08 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8DA210E5CC for ; Thu, 28 Sep 2023 02:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695866761; bh=PiZdKhrE/o3h0tGaT8pGddKF7rJCeQnVsW/gwwhnafM=; h=Date:From:To:Cc:Subject:From; b=GRMuyIVD7OFAFCN42aro0PDyuSEH9y73kCbLx2Kq6Gj6YZz4fO3K+tOC6mLZAOhKi m4nmF7UufaQ0RlTPep1UXZWa94nbczGGUx+6VIh/1qkcjaLqKPqevlSYsHeyg3V4xb 4FQMc7VvWSVDzuMglgD01IYfcECrX235HYTArXiql3omR+Aa216X0yud7VKulNojCa WDTxP01s19bHFCdmeI/q1BHVAVpWO1PjwbcET0J/9znllzN0TTBwh7WiaK6hNCbr2t geCDMMumUAFDJoyQdAyZOSXYqdBYDgEgAAAiSAHL+uVo1inIgzExsZ/YukqwA+bsew AS3DEUAWHkpqA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RwxfJ5ksWz4xQb; Thu, 28 Sep 2023 12:06:00 +1000 (AEST) Date: Thu, 28 Sep 2023 12:05:59 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Message-ID: <20230928120559.485eecd7@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stanislaw Gruszka , Intel Graphics , Linux Kernel Mailing List , DRI , Karol Wachowski , Linux Next Mailing List , Jacek Lawrynowicz Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/accel/ivpu/ivpu_fw.c between commit: 645d694559ca ("accel/ivpu: Use cached buffers for FW loading") from the drm-misc-fixes tree and commit: 53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()") 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 --cc drivers/accel/ivpu/ivpu_fw.c index 0191cf8e5964,d57e103aae1c..000000000000 --- a/drivers/accel/ivpu/ivpu_fw.c