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.7 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 6899CC43463 for ; Fri, 18 Sep 2020 17:03:26 +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 26F7820DD4 for ; Fri, 18 Sep 2020 17:03:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26F7820DD4 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 7DFC46ED35; Fri, 18 Sep 2020 17:03:25 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTP id DF2DA6ED33; Fri, 18 Sep 2020 17:03:23 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id C0DB2A47E1; Fri, 18 Sep 2020 17:03:23 +0000 (UTC) MIME-Version: 1.0 From: Patchwork To: "Christoph Hellwig" Date: Fri, 18 Sep 2020 17:03:23 -0000 Message-ID: <160044860376.6345.2909158861976762209@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20200918163724.2511-1-hch@lst.de> In-Reply-To: <20200918163724.2511-1-hch@lst.de> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBz?= =?utf-8?q?eries_starting_with_=5B1/6=5D_zsmalloc=3A_switch_from_alloc=5Fv?= =?utf-8?q?m=5Farea_to_get=5Fvm=5Farea?= 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: series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area URL : https://patchwork.freedesktop.org/series/81855/ State : failure == Summary == Applying: zsmalloc: switch from alloc_vm_area to get_vm_area Applying: mm: add a vmap_pfn function Applying: drm/i915: use vmap in shmem_pin_map Applying: drm/i915: use vmap in i915_gem_object_map Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_pages.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pages.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915: use vmap in i915_gem_object_map 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