lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 1/2] dt-bindings: arm: qcom: Adding DT binding for zombie
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 <mka@chromium.org> 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 <MyLocalBranchName> 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.

\
 
 \ /
  Last update: 2022-11-28 18:08    [W:0.414 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site