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 DBC01C4338F for ; Fri, 30 Jul 2021 13:30:28 +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 94D34603E7 for ; Fri, 30 Jul 2021 13:30:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 94D34603E7 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 40BA66F444; Fri, 30 Jul 2021 13:30:28 +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 7AE6F6F441; Fri, 30 Jul 2021 13:30:26 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id 71F57A8830; Fri, 30 Jul 2021 13:30:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Cai Huoqing" Date: Fri, 30 Jul 2021 13:30:26 -0000 Message-ID: <162765182643.590.14942510560281326511@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20210730094918.2928-1-caihuoqing@baidu.com> In-Reply-To: <20210730094918.2928-1-caihuoqing@baidu.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915=3A_Fix_typo_in_comments_and_Kconfig=2Edebug?= 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: drm/i915: Fix typo in comments and Kconfig.debug URL : https://patchwork.freedesktop.org/series/93239/ State : failure == Summary == Applying: drm/i915: Fix typo in comments and Kconfig.debug Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Kconfig.debug M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gpu_error.c M drivers/gpu/drm/i915/i915_pci.c M drivers/gpu/drm/i915/i915_perf.c M drivers/gpu/drm/i915/i915_pmu.h M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/i915_vma.c M drivers/gpu/drm/i915/intel_pm.c M drivers/gpu/drm/i915/intel_region_ttm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_region_ttm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_region_ttm.c Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/i915_vma.c Auto-merging drivers/gpu/drm/i915/i915_request.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_pmu.h Auto-merging drivers/gpu/drm/i915/i915_perf.c Auto-merging drivers/gpu/drm/i915/i915_pci.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/Kconfig.debug 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: Fix typo in comments and Kconfig.debug 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".