From mboxrd@z Thu Jan 1 00:00:00 1970 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 30FEBECAAD8 for ; Wed, 14 Sep 2022 00:06:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2F3610E6E9; Wed, 14 Sep 2022 00:06:14 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [IPv6:2610:10:20:722:a800:ff:feee:56cf]) by gabe.freedesktop.org (Postfix) with ESMTP id 042A310E6E9; Wed, 14 Sep 2022 00:06:09 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id F0406A66C9; Wed, 14 Sep 2022 00:06:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Dmitry Osipenko" Date: Wed, 14 Sep 2022 00:06:08 -0000 Message-ID: <166311396895.30164.3261539520068097526@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20220913192757.37727-1-dmitry.osipenko@collabora.com> In-Reply-To: <20220913192757.37727-1-dmitry.osipenko@collabora.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBN?= =?utf-8?q?ove_all_drivers_to_a_common_dma-buf_locking_convention?= 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: , Reply-To: intel-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: Move all drivers to a common dma-buf locking convention URL : https://patchwork.freedesktop.org/series/108517/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/108517/revisions/1/mbox/ not applied Applying: dma-buf: Add unlocked variant of vmapping functions Applying: dma-buf: Add unlocked variant of attachment-mapping functions Applying: drm/gem: Take reservation lock for vmap/vunmap operations Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_gem.c M include/drm/drm_gem.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_gem.h CONFLICT (content): Merge conflict in include/drm/drm_gem.h Auto-merging drivers/gpu/drm/drm_gem.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/gem: Take reservation lock for vmap/vunmap operations When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".