kbuild Git tree and its branches

kbuild Git tree and its branches

[Sedat Dilek]

Hi Marek,

can you enlighten me about the usage of your Git tree and its branches?
For me this is a bit unclear.

Looking into the Trees file from Linux-next I see
***kbuild.git#rc-fixes*** [1,3] and ***kbuild.git#for-next*** [2,4]...

#7: kbuild-current git
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes

#111: kbuild git
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next

Recently I reported some kbuild issues and sent out some own patches
which were pushed or pending.
This stuff is partly in kbuild.git#misc [5] and kbuild.git#kbuild [6].

Are those branches for mainline?
For example, I have seen git-pull request for "misc" stuff [7].

Finally, my question which of your trees are for mainline aka upstream
(Git) or so-called "Linus tree" [8]?
( I would have expected some of the recent commits for "misc" and
"kbuild" to be pulled in "rc-fixes" - this reflects the usage of
"kbuild-current" in Linux-next for me. )

Maybe, you can tell me how your "daily" kbuild workflow is done.
( I am not ashamed to see I have not checked Documentation directory
in Linux source. ]

Thanks for answering my questions in advance.

Regards,
- Sedat -

[1] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees?id=next-20150103#n7
[2] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees?id=next-20150103#n111
[3] http://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/log/?h=rc-fixes
[4] http://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/log/?h=for-next
[5] http://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/log/?h=misc
[6] http://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git/log/?h=kbuild
[7] https://lkml.org/lkml/2014/12/19/354
[8] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git

Re: kbuild Git tree and its branches

[Michal Marek]

On 2015-01-03 11:28, Sedat Dilek wrote:
> Hi Marek,
> 
> can you enlighten me about the usage of your Git tree and its branches?
> For me this is a bit unclear.
> 
> Looking into the Trees file from Linux-next I see
> ***kbuild.git#rc-fixes*** [1,3] and ***kbuild.git#for-next*** [2,4]...
> 
> #7: kbuild-current git
> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
> 
> #111: kbuild git
> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
> 
> Recently I reported some kbuild issues and sent out some own patches
> which were pushed or pending.
> This stuff is partly in kbuild.git#misc [5] and kbuild.git#kbuild [6].

rc-fixes is for the current -rc phase. for-next is for the next merge
window and it is a merge of the topic branches. The for-next branch is
just a convenience so that it's always these two branches that Stephen
pulls into linux-next.


> Finally, my question which of your trees are for mainline aka upstream
> (Git) or so-called "Linus tree" [8]?
> ( I would have expected some of the recent commits for "misc" and
> "kbuild" to be pulled in "rc-fixes" - this reflects the usage of
> "kbuild-current" in Linux-next for me. )
> 
> Maybe, you can tell me how your "daily" kbuild workflow is done.
> ( I am not ashamed to see I have not checked Documentation directory
> in Linux source. ]

Regression fixes are applied to the rc-fixes branch, stuff for the next
merge window goes to either kbuild (core changes), misc (packaging
targets, documentation, etc), or some other branch if it makes sense. At
the end of the day, I merge the topic branches into for-next, do some
test builds and push everything to git.kernel.org. The rc-fixes branch
is sent to Linus for the next -rc after some time, the other topic
branches are sent in the next merge window. Then I update my branches to
the new -rc1 and start over.

hth,
Michal

Re: kbuild Git tree and its branches

[Sedat Dilek]

On Mon, Jan 5, 2015 at 11:08 AM, Michal Marek <mmarek@suse.cz> wrote:
> On 2015-01-03 11:28, Sedat Dilek wrote:
>> Hi Marek,
>>
>> can you enlighten me about the usage of your Git tree and its branches?
>> For me this is a bit unclear.
>>
>> Looking into the Trees file from Linux-next I see
>> ***kbuild.git#rc-fixes*** [1,3] and ***kbuild.git#for-next*** [2,4]...
>>
>> #7: kbuild-current git
>> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
>>
>> #111: kbuild git
>> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
>>
>> Recently I reported some kbuild issues and sent out some own patches
>> which were pushed or pending.
>> This stuff is partly in kbuild.git#misc [5] and kbuild.git#kbuild [6].
>
> rc-fixes is for the current -rc phase. for-next is for the next merge
> window and it is a merge of the topic branches. The for-next branch is
> just a convenience so that it's always these two branches that Stephen
> pulls into linux-next.
>
>
>> Finally, my question which of your trees are for mainline aka upstream
>> (Git) or so-called "Linus tree" [8]?
>> ( I would have expected some of the recent commits for "misc" and
>> "kbuild" to be pulled in "rc-fixes" - this reflects the usage of
>> "kbuild-current" in Linux-next for me. )
>>
>> Maybe, you can tell me how your "daily" kbuild workflow is done.
>> ( I am not ashamed to see I have not checked Documentation directory
>> in Linux source. ]
>
> Regression fixes are applied to the rc-fixes branch, stuff for the next
> merge window goes to either kbuild (core changes), misc (packaging
> targets, documentation, etc), or some other branch if it makes sense. At
> the end of the day, I merge the topic branches into for-next, do some
> test builds and push everything to git.kernel.org. The rc-fixes branch
> is sent to Linus for the next -rc after some time, the other topic
> branches are sent in the next merge window. Then I update my branches to
> the new -rc1 and start over.
>

OK, thanks for the clarification and insights of your workflow.
You can point "confused people" like me to your posting :-).

In other Git trees I see for example (here: linux-block)...

for-3.20/core

for-3.20/drivers

...which are merged into the...

for-next

...branch.

That makes it very obvious for followers.

I remember I asked Daniel Vetter to enlighten about drm/i915 development.
This resulted in a very nice blog article "drm/i915 Branches
Explained" (see [1]).

Just to give you some inspiration not taping on your nerves.

- Sedat -

[1] http://blog.ffwll.ch/2013/07/drmi915-branches-explained.html