Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD6D0267B13 for ; Fri, 18 Apr 2025 03:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945440; cv=none; b=mEahehmZY2W4liaHUZi8yXuW2ijaqiMseLkMn8biE8XBXPmvpG9qESn76lZVxul6Guukk7+MnTqTWmtKOP5FG2M4acYWJ7K6n0RcZ7U232FuZsOVUdjSNQHdpuZKoPM5hwA7D0G0LfypHnQdYXWEdZ+aqZgKvHEo4OetgPWa/o0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945440; c=relaxed/simple; bh=hOX1A+zR/qQCLuCft8EOF86jaAPy+rLBlzcQG+8zl9o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=tqrx9xOtaGMxmGidWBqisZW+GtEEOO4Y9W1BmdV+Da8ik/48ZkZUvYVTInmeZSG0u++W5bnkNg6P5i3nDllCIONW8o5FR/tOvdiuF5Jim/6K8ubXcd2hRnj/Rqx/AGgTsrxmuic899jFJjohiAOSNflkZ+a7amklw9zO1HSSSno= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bea56DEp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bea56DEp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31760C4CEED; Fri, 18 Apr 2025 03:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744945439; bh=hOX1A+zR/qQCLuCft8EOF86jaAPy+rLBlzcQG+8zl9o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bea56DEpOMXvJxhhiWRJFiLmKBUP0RfDDGzUE9+ntGJqVDUVj4YmLbszBV9AuC8NQ r1JDv04fN0N2u5N6TmM9TOVfE72t/B3QFq3Lo4kXBf5ulZzaQH95k5LhS+2hRFAUXm zY9NeN/zLS7ICpBa3ZagxKrLUCYZVkItcFH5/T9X9SRIYHaOkQH+4b7ihamUmpnOg0 qXMvxJTM/NfCEFI4E1kCKYnrzndWosi68EBL6vXV7Vi8NmMVlfX06/VVzrS+1bGzUA GTvOz870bDUHTxOKZ5CUtiPo8mLv2R0eJ0kyguhksGA6v0sejTMrGH2r9C5bBJsr9v od3UYet6q8ZFg== Date: Thu, 17 Apr 2025 20:03:57 -0700 From: Luis Chamberlain To: Chuck Lever III Cc: Daniel Gomez , "cel@kernel.org" , Daniel Gomez , "kdevops@lists.linux.dev" Subject: Re: [PATCH] kconfig: "output yaml" renders boolean N as a comment Message-ID: References: <20250417151334.3135530-1-cel@kernel.org> <1F522960-C622-4E23-8D74-5F34F32DEAFC@oracle.com> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1F522960-C622-4E23-8D74-5F34F32DEAFC@oracle.com> On Fri, Apr 18, 2025 at 01:13:05AM +0000, Chuck Lever III wrote: > > > After pushing the patch to kconfig / yamlconfig, I tried using > the Makefile.subtrees targets to merge that commit into > kdevops / main, and got this: > > cel@renoir:/tmp/kdevops$ make -f Makefile.subtrees refresh-subtrees > fatal: refusing to merge unrelated histories So.. basically when I removed the old results archive to get the kdevops tree to go on a diet (first patch in the tree now) I git added *everyhing* back... and I forgot to add instead kconfig as a git subtree then. So that messed up the history. There however is a trick which can be adopted for very obscure ways to use git subtrees when this happens, essentially we tell git -- don't worry, trust me. The git ocult trick is documented under kdevops git commit ec5a7d94a3b99e5 ("Split 'scripts/kconfig/' into commit 'd2ca2620d14b94bc94e9e0d9adc7a3d030ae13c7'". Its why I documented carefully there as there is no man pages about this fun way to use git subtrees this way. In fact I don't think the authors intended for this to work, but it does. Luis