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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80B7FC432BE for ; Tue, 31 Aug 2021 10:16:36 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 39F7F60F92 for ; Tue, 31 Aug 2021 10:16:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 39F7F60F92 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=emeril.freedesktop.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABD5789A57; Tue, 31 Aug 2021 10:16:35 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTP id ACFFB899FF; Tue, 31 Aug 2021 10:16:34 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id A3D0AA7E03; Tue, 31 Aug 2021 10:16:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Maarten Lankhorst" Cc: intel-gfx@lists.freedesktop.org Date: Tue, 31 Aug 2021 10:16:34 -0000 Message-ID: <163040499463.10658.6497698319981937686@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20210813203033.3179400-1-daniel.vetter@ffwll.ch> In-Reply-To: <20210813203033.3179400-1-daniel.vetter@ffwll.ch> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBz?= =?utf-8?q?eries_starting_with_drm/i915=3A_Release_i915=5Fgem=5Fcontext_fr?= =?utf-8?q?om_a_worker_=28rev3=29?= 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: series starting with drm/i915: Release i915_gem_context from a worker (rev3) URL : https://patchwork.freedesktop.org/series/93693/ State : failure == Summary == Applying: drm/i915: Release i915_gem_context from a worker Applying: drm/i915: Release ctx->syncobj on final put, not on ctx close Applying: drm/i915: Keep gem ctx->vm alive until the final put Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_context.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.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/i915: Keep gem ctx->vm alive until the final put 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".