From patchwork Wed Nov 22 00:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13463779 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 E49A1C61D85 for ; Wed, 22 Nov 2023 00:29:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00E2510E5BB; Wed, 22 Nov 2023 00:29:41 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6776A10E5BA; Wed, 22 Nov 2023 00:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700612973; bh=NavejzRn6aIoSlrOplrfI6W3+q6tZqXpfcPZH5NPdKU=; h=Date:From:To:Cc:Subject:From; b=pD+oHtCrUImQFRms4jGN1oJD4HmI7hFhQCcQ/4Bqwr/XNEcwmHGc0z4vE+ZnTa2iV +4ekaqby84xho2zDZlgML0C9SLZfOcwSB0DBzvNdG02ExK0fEFBFR0+nWUnq91Go8R bxAT3BIBXi5hZOcmfqMMBwO+JhkHXnhGC9WYCnI7UHUYcQqyR4Y2z/3XjRAMhDqhXI rKSU4cQv/7k3VmbrFdlyH/JqORxxI95hO3OX5eej7VZj8RbsY9oMS10WmRwMrLJBBd 70MJfLidjjvbMvr/kPWFuXTzH+tlWeKgBYqChmCu0g0moa+ov8Y8lkicrNzWTWnTpo 7RwSqLlvaqnvw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SZhvc0cHDz4x7q; Wed, 22 Nov 2023 11:29:31 +1100 (AEDT) Date: Wed, 22 Nov 2023 11:29:30 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Message-ID: <20231122112930.5e7c7bcd@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: Intel Graphics , Linux Kernel Mailing List , DRI , Stanislaw Gruszka , Linux Next Mailing List , Jacek Lawrynowicz , Andrzej Kacprowski 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_hw_37xx.c between commit: 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset") from the drm-misc-fixes tree and commits: 3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VPU firmware") cc19fedab8bd ("accel/ivpu/37xx: Print warning when VPUIP is not idle during power down") 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_hw_37xx.c index 4ccf1994b97a,4ab1f14cf360..000000000000 --- a/drivers/accel/ivpu/ivpu_hw_37xx.c