Skip to contentSkip to conversation

MAINTAINERS tree branches [xen tip as an example]

DISCUSSION Luis R. Rodriguez 3 participants 13 messages Jan 17, 2014 – Jan 23, 2014

lore
Share & tools
lore
#0 lore raw

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

[0] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n176
[1] http://lists.xen.org/archives/html/xen-devel/2014-01/msg01504.html
[2] git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
[3] http://wiki.xenproject.org/wiki/Xen_Repositories#Primary_Xen_Repository
[4] git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git

mcgrof@bubbles ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git --reference linux/.git Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (334/334), done.
remote: Total 1797 (delta 1511), reused 1646 (delta 1462)
Receiving objects: 100% (1797/1797), 711.01 KiB | 640.00 KiB/s, done. Resolving deltas: 100% (1511/1511), completed with 306 local objects. Checking connectivity... done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

mcgrof@work ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git -b linux-next --reference linux/.git Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (377/377), done.
remote: Total 1797 (delta 1545), reused 1607 (delta 1419)
Receiving objects: 100% (1797/1797), 485.23 KiB | 0 bytes/s, done.
Resolving deltas: 100% (1545/1545), completed with 327 local objects.
Checking connectivity... done.
Checking out files: 100% (44979/44979), done.

Luis

#1 lore raw
Quoted 5 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1]
from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a

Quoted 8 lines

fresh clone [shown below], but as expected does work well when only cloning
the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like
these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches
required, so perhaps it should -- if we want to live with these ?

The master branch can be linked to the #linux-next or stable/for-linus.

That would solve the problem I think.

Quoted 8 lines

Curious, how
many other git are there with a similar situation ?

The xen project web site actually lists [3] Konrad's xen git tree [4] for
development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

Thank you for reporting. Will fix it next week if nobody else beats me to it.

Quoted 34 lines

[0]
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n176
[1] http://lists.xen.org/archives/html/xen-devel/2014-01/msg01504.html
[2] git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
[3]
http://wiki.xenproject.org/wiki/Xen_Repositories#Primary_Xen_Repository
[4] git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git

mcgrof@bubbles ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git --reference linux/.git
Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (334/334), done.
remote: Total 1797 (delta 1511), reused 1646 (delta 1462) Receiving objects: 100% (1797/1797), 711.01 KiB | 640.00 KiB/s, done. Resolving deltas: 100% (1511/1511), completed with 306 local objects. Checking connectivity... done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

mcgrof@work ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git -b linux-next --reference linux/.git
Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (377/377), done.
remote: Total 1797 (delta 1545), reused 1607 (delta 1419) Receiving objects: 100% (1797/1797), 485.23 KiB | 0 bytes/s, done. Resolving deltas: 100% (1545/1545), completed with 327 local objects. Checking connectivity... done.
Checking out files: 100% (44979/44979), done.

Luis

#2 lore raw
In reply to Luis R. Rodriguez
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

David

#3 lore raw
In reply to Luis R. Rodriguez
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

David

#4 lore raw
Quoted 11 lines · David Vrabel
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

Quoted 3 lines

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

OK thanks.

Quoted 10 lines
Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

Luis

#5 lore raw
In reply to David Vrabel
Quoted 11 lines · David Vrabel
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

Quoted 3 lines

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

OK thanks.

Quoted 10 lines
Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

Luis

#6 lore raw
Quoted 34 lines · Luis R. Rodriguez
Quoted 2 lines · David Vrabel
Quoted 1 line · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS

patch [1]

Quoted 2 lines
Quoted 2 lines

from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references

when doing a

Quoted 1 line
Quoted 1 line

fresh clone [shown below], but as expected does work well when only

cloning

Quoted 2 lines
Quoted 2 lines

the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees

like

Quoted 1 line
Quoted 1 line

these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify

branches

Quoted 1 line
Quoted 1 line

required, so perhaps it should -- if we want to live with these ?

Curious, how

Quoted 3 lines
Quoted 1 line

many other git are there with a similar situation ?

We don't recommend doing development work for the Xen subsystem based

on

Quoted 1 line

xen/tip.git so I think it's fine to have to checkout the specific

branch

Quoted 1 line

you are interested in.

OK thanks.

Quoted 1 line
Quoted 1 line

The xen project web site actually lists [3] Konrad's xen git tree

[4] for

Quoted 2 lines
Quoted 2 lines

development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the

linux-next

Quoted 2 lines
Quoted 1 line

branch ?

Quoted 7 lines
Quoted 5 lines

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small?

Depends

Quoted 2 lines

Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

Potentially. Usually the maintainer will spot where there are potential conflicts and give you a branch to base on.

Quoted 9 lines
Quoted 5 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

It should work now. I made master point to 3.13.

Quoted 2 lines

Luis

#7 lore raw
In reply to Luis R. Rodriguez
Quoted 25 lines · Luis R. Rodriguez
Quoted 11 lines · David Vrabel
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

Quoted 3 lines

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

OK thanks.

Quoted 7 lines
Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

Quoted 7 lines
Quoted 3 lines

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

We've not had any issues so far.

Quoted 8 lines
Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

I think it did work, you just needed to checkout a branch manually.

But it looks like Konrad has pushed a master branch recently, as well.

David

#8 lore raw
In reply to Luis R. Rodriguez
Quoted 25 lines · Luis R. Rodriguez
Quoted 11 lines · David Vrabel
Quoted 9 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1] from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a fresh clone [shown below], but as expected does work well when only cloning the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches required, so perhaps it should -- if we want to live with these ? Curious, how many other git are there with a similar situation ?

Quoted 3 lines

We don't recommend doing development work for the Xen subsystem based on xen/tip.git so I think it's fine to have to checkout the specific branch you are interested in.

OK thanks.

Quoted 7 lines
Quoted 4 lines

The xen project web site actually lists [3] Konrad's xen git tree [4] for development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

I've updated the wiki to read:

Quoted 7 lines
Quoted 3 lines

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

We've not had any issues so far.

Quoted 8 lines
Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

I think it did work, you just needed to checkout a branch manually.

But it looks like Konrad has pushed a master branch recently, as well.

David

#9 lore raw
Quoted 6 lines · David Vrabel
Quoted 3 lines · Luis R. Rodriguez

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

We've not had any issues so far.

Will give that a shot.

Quoted 10 lines
Quoted 8 lines
Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

I think it did work, you just needed to checkout a branch manually.

Indeed, I just didn't expect random developer to know how to fix this, and if other git trees will exist in the same form I figured its best to extend MAINTAINERS to specify the preference for a branch. In this case, since the branch is not recommended for development, I suppose the recommendation no longer applies for this tree.

Quoted 1 line

But it looks like Konrad has pushed a master branch recently, as well.

That gives me a warm fuzzy, thanks.

Luis

#10 lore raw
In reply to David Vrabel
Quoted 6 lines · David Vrabel
Quoted 3 lines · Luis R. Rodriguez

Is the delta of what is queued for the next release typically small? Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

We've not had any issues so far.

Will give that a shot.

Quoted 10 lines
Quoted 8 lines
Quoted 4 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

I think it did work, you just needed to checkout a branch manually.

Indeed, I just didn't expect random developer to know how to fix this, and if other git trees will exist in the same form I figured its best to extend MAINTAINERS to specify the preference for a branch. In this case, since the branch is not recommended for development, I suppose the recommendation no longer applies for this tree.

Quoted 1 line

But it looks like Konrad has pushed a master branch recently, as well.

That gives me a warm fuzzy, thanks.

Luis

#11 lore raw
In reply to Luis R. Rodriguez
Quoted 34 lines · Luis R. Rodriguez
Quoted 2 lines · David Vrabel
Quoted 1 line · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS

patch [1]

Quoted 2 lines
Quoted 2 lines

from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references

when doing a

Quoted 1 line
Quoted 1 line

fresh clone [shown below], but as expected does work well when only

cloning

Quoted 2 lines
Quoted 2 lines

the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees

like

Quoted 1 line
Quoted 1 line

these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify

branches

Quoted 1 line
Quoted 1 line

required, so perhaps it should -- if we want to live with these ?

Curious, how

Quoted 3 lines
Quoted 1 line

many other git are there with a similar situation ?

We don't recommend doing development work for the Xen subsystem based

on

Quoted 1 line

xen/tip.git so I think it's fine to have to checkout the specific

branch

Quoted 1 line

you are interested in.

OK thanks.

Quoted 1 line
Quoted 1 line

The xen project web site actually lists [3] Konrad's xen git tree

[4] for

Quoted 2 lines
Quoted 2 lines

development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the

linux-next

Quoted 2 lines
Quoted 1 line

branch ?

Quoted 7 lines
Quoted 5 lines

I've updated the wiki to read:

For development the recommended branch is:

The mainline Linus linux.git tree.

Is the delta of what is queued for the next release typically small?

Depends

Quoted 2 lines

Otherwise someone doing development based on linux.git alone should have conflicts with anything on the queue, no?

Potentially. Usually the maintainer will spot where there are potential conflicts and give you a branch to base on.

Quoted 9 lines
Quoted 5 lines

To see what's queued for the next release, the next merge window, and other work in progress:

The Xen subsystem maintainers' tip.git tree.

That's the thing, you can't clone the tip.git tree today well, there are undefined references and git gives up, asking for the linux-next branch however did work.

It should work now. I made master point to 3.13.

Quoted 2 lines

Luis

#12 lore raw
In reply to Luis R. Rodriguez
Quoted 5 lines · Luis R. Rodriguez

As per linux-next Next/Trees [0], and a recent January MAINTAINERS patch [1]
from David one of the xen development kernel git trees to track is xen/git.git [2], this tree however gives has undefined references when doing a

Quoted 8 lines

fresh clone [shown below], but as expected does work well when only cloning
the linux-next branch [also below]. While I'm sure this is fine for folks who can do the guess work do we really want to live with trees like
these on MAINTAINERS ? The MAINTAINERS file doesn't let us specify branches
required, so perhaps it should -- if we want to live with these ?

The master branch can be linked to the #linux-next or stable/for-linus.

That would solve the problem I think.

Quoted 8 lines

Curious, how
many other git are there with a similar situation ?

The xen project web site actually lists [3] Konrad's xen git tree [4] for
development as the primary development tree, that probably should be updated now, and likely with instructions to clone only the linux-next branch ?

Thank you for reporting. Will fix it next week if nobody else beats me to it.

Quoted 34 lines

[0]
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n176
[1] http://lists.xen.org/archives/html/xen-devel/2014-01/msg01504.html
[2] git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
[3]
http://wiki.xenproject.org/wiki/Xen_Repositories#Primary_Xen_Repository
[4] git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git

mcgrof@bubbles ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git --reference linux/.git
Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (334/334), done.
remote: Total 1797 (delta 1511), reused 1646 (delta 1462) Receiving objects: 100% (1797/1797), 711.01 KiB | 640.00 KiB/s, done. Resolving deltas: 100% (1511/1511), completed with 306 local objects. Checking connectivity... done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

mcgrof@work ~ $ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git -b linux-next --reference linux/.git
Cloning into 'tip'...
remote: Counting objects: 2806, done.
remote: Compressing objects: 100% (377/377), done.
remote: Total 1797 (delta 1545), reused 1607 (delta 1419) Receiving objects: 100% (1797/1797), 485.23 KiB | 0 bytes/s, done. Resolving deltas: 100% (1545/1545), completed with 327 local objects. Checking connectivity... done.
Checking out files: 100% (44979/44979), done.

Luis