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 DF003C38147 for ; Wed, 18 Jan 2023 11:17:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8956810E715; Wed, 18 Jan 2023 11:17:10 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 395FA10E15E; Wed, 18 Jan 2023 11:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674040627; x=1705576627; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=9Nqfb28YBk5vxcFhw+YWbewR4Fqv+GH7icqfFVVRs7A=; b=NKO8aKusbtTaRIJ9Q52JpZ8vA1kI2xr7YsUjuCC+hageZKycbyXCtyLm MI8m+/8+ehePVKCR9RXXh7aSxV2BYc97Jz04JsPsOulGdcH8lwu2KzCOi MMn+yMIqjEuvjplQj50ntmC18gAn0PSZDkJECzGlLeggIxgDGTtMf2Ygm d10SQc4TYExxUZso3IyB5OyBr8qhCG4FI/Ta278uptuYxpWgZMFnq/3pQ ahWuzbbHKbRedF+bxtfvRDEIj21vez2BW5MAO0/8PbIqD1nyvMFrsP4zb hoqq4TYA/87OGN6kjmxGSBpXvbtAp24ChXvVnAPRRGKz/NIJUnz4VP0yx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="389460655" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="389460655" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 03:17:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="652886548" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="652886548" Received: from kozlovdm-mobl3.ger.corp.intel.com (HELO localhost) ([10.252.28.132]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 03:16:27 -0800 From: Jani Nikula To: Christian =?utf-8?Q?K=C3=B6nig?= , dri-devel , Intel Graphics Development , Dave Airlie , Daniel Vetter In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Wed, 18 Jan 2023 13:16:24 +0200 Message-ID: <87h6wocctz.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] Ongoing failure for "dim rebuild-tip" 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 18 Jan 2023, Christian K=C3=B6nig wrote: > Hi guys, > > for a couple of weeks now the command "dim rebuild-tip" fails for me.=20 > The error message is: > > Merging drm-intel/drm-intel-gt-next... Applying manual fixup patch for=20 > drm-tip merge... patching file drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > dim: > dim: FAILURE: Could not merge drm-intel/drm-intel-gt-next > dim: See the section "Resolving Conflicts when Rebuilding drm-tip" > dim: in the drm-tip.rst documentation for how to handle this situation. > > This also happens on a fresh clean install of dim, so I'm pretty sure=20 > that this isn't a problem on my side. > > What can we do? I think you should probably try to update your git. Looks like you're using git version 2.25.1, and over the past year most people have been using 2.34.1 or later. There can be subtle differences either in the merge conflicts or in the recorded conflict resolutions (git rerere) between git versions, and sometimes a resolution from one can't be reused in another. If we knew which exact versions we require, we could add a check in dim. Maybe we should just randomly warn about older than 2.34.1. *shrug*. BR, Jani. --=20 Jani Nikula, Intel Open Source Graphics Center 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 02B32C38147 for ; Wed, 18 Jan 2023 11:17:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2538410E15E; Wed, 18 Jan 2023 11:17:09 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 395FA10E15E; Wed, 18 Jan 2023 11:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674040627; x=1705576627; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=9Nqfb28YBk5vxcFhw+YWbewR4Fqv+GH7icqfFVVRs7A=; b=NKO8aKusbtTaRIJ9Q52JpZ8vA1kI2xr7YsUjuCC+hageZKycbyXCtyLm MI8m+/8+ehePVKCR9RXXh7aSxV2BYc97Jz04JsPsOulGdcH8lwu2KzCOi MMn+yMIqjEuvjplQj50ntmC18gAn0PSZDkJECzGlLeggIxgDGTtMf2Ygm d10SQc4TYExxUZso3IyB5OyBr8qhCG4FI/Ta278uptuYxpWgZMFnq/3pQ ahWuzbbHKbRedF+bxtfvRDEIj21vez2BW5MAO0/8PbIqD1nyvMFrsP4zb hoqq4TYA/87OGN6kjmxGSBpXvbtAp24ChXvVnAPRRGKz/NIJUnz4VP0yx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="389460655" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="389460655" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 03:17:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="652886548" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="652886548" Received: from kozlovdm-mobl3.ger.corp.intel.com (HELO localhost) ([10.252.28.132]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 03:16:27 -0800 From: Jani Nikula To: Christian =?utf-8?Q?K=C3=B6nig?= , dri-devel , Intel Graphics Development , Dave Airlie , Daniel Vetter Subject: Re: Ongoing failure for "dim rebuild-tip" In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Wed, 18 Jan 2023 13:16:24 +0200 Message-ID: <87h6wocctz.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 18 Jan 2023, Christian K=C3=B6nig wrote: > Hi guys, > > for a couple of weeks now the command "dim rebuild-tip" fails for me.=20 > The error message is: > > Merging drm-intel/drm-intel-gt-next... Applying manual fixup patch for=20 > drm-tip merge... patching file drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > dim: > dim: FAILURE: Could not merge drm-intel/drm-intel-gt-next > dim: See the section "Resolving Conflicts when Rebuilding drm-tip" > dim: in the drm-tip.rst documentation for how to handle this situation. > > This also happens on a fresh clean install of dim, so I'm pretty sure=20 > that this isn't a problem on my side. > > What can we do? I think you should probably try to update your git. Looks like you're using git version 2.25.1, and over the past year most people have been using 2.34.1 or later. There can be subtle differences either in the merge conflicts or in the recorded conflict resolutions (git rerere) between git versions, and sometimes a resolution from one can't be reused in another. If we knew which exact versions we require, we could add a check in dim. Maybe we should just randomly warn about older than 2.34.1. *shrug*. BR, Jani. --=20 Jani Nikula, Intel Open Source Graphics Center