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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D627C433FE for ; Mon, 28 Nov 2022 17:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232831AbiK1RIM (ORCPT ); Mon, 28 Nov 2022 12:08:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232637AbiK1RHy (ORCPT ); Mon, 28 Nov 2022 12:07:54 -0500 Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 564C412AF5 for ; Mon, 28 Nov 2022 09:07:52 -0800 (PST) Received: by mail-io1-f53.google.com with SMTP id r81so8083458iod.2 for ; Mon, 28 Nov 2022 09:07:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=igPdFyjO35ZpKO+vYdPwkIUVgK4YYNs5Tn93PDEG5qo=; b=1M2P+b4BMXJaxTmRrXbMvqzCjCeBUyvLo8Ds2uHYcBeA7Z7ggsLKQ2tB1B1iM+X+nC r8xX1bCx36WMj0tLu21wbwjNHlzjy/a+fJAzE5Q5fRgNnun39S8jddPZCjD0nJnkRR+i VaTqpWONAWWzOVnoLIFSSk3WdBDYKlR4YKRzYqM8I6RrubUZCD9amqYZ6EACa1Z4dBWc SrfkothyzMKjIiVaPVd8Rxm4mnjJGzCLGUhgu+NinXhlLP5ToWpAZEvsskJaDgkLjwZS 42fxlb41031RkqPZmKCVIDy7YSAUR0yY+2Q8xpfz20D8JX0wS9Z+Rw4crem2mKhl1Lxm n3dw== X-Gm-Message-State: ANoB5pktn12dceSFLTnAm/2gH+/3nUcFayMFEEx+RzA7yq7xagLGp74b MHln76DFdkra1X7oZRYXEaWDyw== X-Google-Smtp-Source: AA0mqf6dZyZDdW7YMXoUdCdKsv4wcvFxNrCZ9SnWjpdxJctmmOaXVtUYw9WlNujpMLLqsz8mrCy7XA== X-Received: by 2002:a6b:f616:0:b0:6df:2c14:f642 with SMTP id n22-20020a6bf616000000b006df2c14f642mr10368857ioh.43.1669655271371; Mon, 28 Nov 2022 09:07:51 -0800 (PST) Received: from google.com (30.23.70.34.bc.googleusercontent.com. [34.70.23.30]) by smtp.gmail.com with ESMTPSA id p7-20020a02b007000000b0037fbfe86e77sm4540557jah.3.2022.11.28.09.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 09:07:51 -0800 (PST) Date: Mon, 28 Nov 2022 17:07:48 +0000 From: Matthias Kaehlcke To: Doug Anderson Cc: =?utf-8?B?5qWK5a6X57+w?= , LKML , Bob Moragues , Harvey , Stephen Boyd , Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, Abner.Yen@ecs.com.tw, Gavin.Lee@ecs.com.tw, Vicy.Lee@ecs.com.tw, Jason.Huang@ecs.com.tw, Darren.Chen@ecs.com.tw Subject: Re: [PATCH v2 1/2] dt-bindings: arm: qcom: Adding DT binding for zombie Message-ID: References: <20221122203635.v2.1.Ie05fd439d0b271b927acb25c2a6e41af7a927e90@changeid> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 28, 2022 at 08:20:36AM -0800, Doug Anderson wrote: > Hi, > > On Wed, Nov 23, 2022 at 7:07 AM Matthias Kaehlcke wrote: > > > > > My checkout steps as below: > > > $ git remote add linux_qcom git://git.kernel.org/pub/scm/linux/kernel/git/ > > > qcom/linux.git > > > $ git fetch --no-tags linux_qcom > > > $ git checkout -b linux_qcom/for-next > > > > > > Is my code base branch still worng? Am I missing something? > > > > My understanding is that it is best to base you changes on a branch like > > 'arm64-for-6.2' as the 'for-next' branch is re-created every time changes > > land in one of the '${area}-for-${version}' branches. > > > > No big issue in this case, just use the corresponding '${area}-for-${version}' > > branch for future patches/versions :) > > FWIW, I usually just use Bjron's for-next branch for stuff like this. > While the merge commits in the the Qualcomm "for-next" branch are > re-created every time, because of the way "git" works the git hashes > of the actual patches are the same as the git hashes of the patches in > the separate branches. All the patches in "for-next" should be ones > that are fine to base your patches on. I had minor concerns that occasionally tools might get confused it they try to find the parent tree of a patch based on the unstable hash of the merge commit in "for-next". Not sure if it is much of an issue in practice.