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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 08D67C433EF for ; Thu, 3 Feb 2022 14:12:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7081F10FA1A; Thu, 3 Feb 2022 14:12:36 +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 BA66410FA19; Thu, 3 Feb 2022 14:12:35 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id B685FA8836; Thu, 3 Feb 2022 14:12:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Arunpravin" Date: Thu, 03 Feb 2022 14:12:35 -0000 Message-ID: <164389755570.15869.16808119558998777767@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20220203133234.3350-1-Arunpravin.PaneerSelvam@amd.com> In-Reply-To: <20220203133234.3350-1-Arunpravin.PaneerSelvam@amd.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBz?= =?utf-8?q?eries_starting_with_=5B1/7=5D_drm/selftests=3A_Move_i915_buddy_?= =?utf-8?q?selftests_into_drm?= 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: series starting with [1/7] drm/selftests: Move i915 buddy selftests into drm URL : https://patchwork.freedesktop.org/series/99663/ State : failure == Summary == Applying: drm/selftests: Move i915 buddy selftests into drm Applying: drm/selftests: add drm buddy alloc limit testcase Applying: drm/selftests: add drm buddy alloc range testcase Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_buddy.c M include/drm/drm_buddy.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_buddy.h CONFLICT (content): Merge conflict in include/drm/drm_buddy.h Auto-merging drivers/gpu/drm/drm_buddy.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_buddy.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/selftests: add drm buddy alloc range testcase 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".