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 A12ADC4320A for ; Mon, 9 Aug 2021 15:19:10 +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 6229260F93 for ; Mon, 9 Aug 2021 15:19:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6229260F93 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 A592789C3F; Mon, 9 Aug 2021 15:19:09 +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 0FCCE89BF0; Mon, 9 Aug 2021 15:19:09 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id 05136A73C9; Mon, 9 Aug 2021 15:19:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "zhouchuangao" Cc: intel-gfx@lists.freedesktop.org Date: Mon, 09 Aug 2021 15:19:09 -0000 Message-ID: <162852234901.2459.5452405473514264147@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <1628326354-96951-1-git-send-email-zhouchuangao@vivo.com> In-Reply-To: <1628326354-96951-1-git-send-email-zhouchuangao@vivo.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBn?= =?utf-8?q?pu/drm/i915=3A_Remove_duplicated_include_of_intel=5Fregion=5Flm?= =?utf-8?b?ZW0uaCAocmV2Mik=?= 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: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h (rev2) URL : https://patchwork.freedesktop.org/series/93305/ State : failure == Summary == Applying: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_region_lmem.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_region_lmem.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 gpu/drm/i915: Remove duplicated include of intel_region_lmem.h 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".