From patchwork Tue Nov 14 00:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13454655 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 3A20FC4332F for ; Tue, 14 Nov 2023 00:31:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3490810E427; Tue, 14 Nov 2023 00:31:19 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8770610E3C1; Tue, 14 Nov 2023 00:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699921876; bh=VyI7R1XJebV+RTSJaiiX2a3dm6cnIzCQjDXJv9HV42Q=; h=Date:From:To:Cc:Subject:From; b=KfjQUAm/j8b26226HhYFrqRDhEhRMFsiOfQlNa14l3DL2upMwkBJn+MP3XzrKmWJX 077K+WpFGUd2ldtXrCGvEnzzpBbn/Ti7PQPhGCX91Bhf0y6VFafmqdZp49Ir1MhdQO xxMUbwFq/biTmwBJ92O0Zxx3Z4uad/hEb36yU9tSp3aCLOdKDlH8OuWhkai4Xmygmk By2g9PHF/xXSl9vAjNaY8fhMiy6qj1zfvHVJaoAWRyE/dHcggC+qTVFtGo7ev6/WQJ U8/0c0ctTd8TWd6HlNoYIFGW7X/Bc4ft+HEN/x5sxf+rMA8fygv3UXh8KJZM1DS8gp F9BBYsD1uxGbA== 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 4STnKH6wJdz4xPf; Tue, 14 Nov 2023 11:31:15 +1100 (AEDT) Date: Tue, 14 Nov 2023 11:31:15 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20231114113115.50d8897b@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' 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 , Linux Next Mailing List , Linux Kernel Mailing List Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/accel/ivpu/ivpu_ipc.c between commit: b0873eead1d1 ("accel/ivpu: Do not use wait event interruptible") from Linus' tree and commit: 57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend") from the drm-misc 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_ipc.c index a4ca40b184d4,618dbc17df80..000000000000 --- a/drivers/accel/ivpu/ivpu_ipc.c