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, URIBL_BLOCKED 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 2EAB0C47083 for ; Wed, 2 Jun 2021 17:31:39 +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 E7D3061D40 for ; Wed, 2 Jun 2021 17:31:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7D3061D40 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95E716EE1D; Wed, 2 Jun 2021 17:31:38 +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 68EA26EE1D; Wed, 2 Jun 2021 17:31:37 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id 60BF7A8836; Wed, 2 Jun 2021 17:31:37 +0000 (UTC) MIME-Version: 1.0 From: Patchwork To: =?utf-8?q?Thomas_Hellstr=C3=B6m?= Date: Wed, 02 Jun 2021 17:31:37 -0000 Message-ID: <162265509739.11226.13087655977031018311@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> In-Reply-To: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915=3A_Move_system_memory_to_TTM_for_discrete?= 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: drm/i915: Move system memory to TTM for discrete URL : https://patchwork.freedesktop.org/series/90898/ State : failure == Summary == Applying: drm/i915: Update object placement flags to be mutable Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_mman.c M drivers/gpu/drm/i915/gem/i915_gem_object.c M drivers/gpu/drm/i915/gem/i915_gem_object.h M drivers/gpu/drm/i915/gem/i915_gem_object_types.h M drivers/gpu/drm/i915/gem/i915_gem_pages.c A drivers/gpu/drm/i915/gem/i915_gem_ttm.c M drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c CONFLICT (modify/delete): drivers/gpu/drm/i915/gem/i915_gem_ttm.c deleted in HEAD and modified in drm/i915: Update object placement flags to be mutable. Version drm/i915: Update object placement flags to be mutable of drivers/gpu/drm/i915/gem/i915_gem_ttm.c left in tree. Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object_types.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mman.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915: Update object placement flags to be mutable 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx