FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
Upstreamable branches: * master : base branch in sync with linus' tree * arm/* : topic branches for ARM architecture support stuff * arm-all : merge branch of arm/* (excluding arm/development/ branches)
Changes appearing in the above branches has either been posted on upstream lists or is about to be posted.
Development branches: * development/* : development versions of upstreamable branches.
These are more volatile and may not have been discussed upstream.
Dirty branches: * dirty/* : hacking branches which are considered unsuitable for upstream * dirty-all : merge of all interesting changes including dirty ones
The dirty* branches are not ready for upstreaming: Don't pull these branches without good reason.
Do we have a systematic place to document the contents of git trees? I put the above text in linux-2.6-arm.git/description, but gitweb only seems to show the first line.
I'm a bit of a newbie to this, so any comments welcome regarding how I've set this up.
Note: If you want to build a Thumb-2 kernel, you'll probably need dirty/gas-adr-bug, which contains a fix which is needed when building a Thumb-2 kernel due to a bug in gas.
Cheers ---Dave
On Wed, 17 Nov 2010, Dave Martin wrote:
FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
Upstreamable branches:
- master : base branch in sync with linus' tree
- arm/* : topic branches for ARM architecture support stuff
- arm-all : merge branch of arm/* (excluding arm/development/ branches)
Changes appearing in the above branches has either been posted on upstream lists or is about to be posted.
Development branches:
- development/* : development versions of upstreamable branches.
These are more volatile and may not have been discussed upstream.
Dirty branches:
- dirty/* : hacking branches which are considered unsuitable for upstream
- dirty-all : merge of all interesting changes including dirty ones
The dirty* branches are not ready for upstreaming: Don't pull these branches without good reason.
Do we have a systematic place to document the contents of git trees? I put the above text in linux-2.6-arm.git/description, but gitweb only seems to show the first line.
I don't think we do. Maybe a wiki page with that info could do it? I've also received a few inquiries about what the Linaro kernel tree is and what it is not and therefore that information could belong there too.
I'm a bit of a newbie to this, so any comments welcome regarding how I've set this up.
This looks excellent!
Nicolas
On Wed, Nov 17, 2010 at 9:11 PM, Nicolas Pitre nicolas.pitre@linaro.org wrote:
On Wed, 17 Nov 2010, Dave Martin wrote:
Do we have a systematic place to document the contents of git trees? I put the above text in linux-2.6-arm.git/description, but gitweb only seems to show the first line.
I don't think we do. Maybe a wiki page with that info could do it? I've also received a few inquiries about what the Linaro kernel tree is and what it is not and therefore that information could belong there too.
A wiki page explicitly stating our patch acceptance criteria would also be welcome. This is of interest to upstream distributions that might be interested in merging the linaro kernel into their own.
/Amit
On Wed, Nov 17, 2010 at 11:33 PM, Dave Martin dave.martin@linaro.org wrote:
FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
I'm wondering how to setup personal git tree on git.linaro.org, any wiki page for that?
BR, Jason
Cheers ---Dave
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
On Thu, Nov 18, 2010 at 12:30 PM, Jason Hui jason.hui@linaro.org wrote:
On Wed, Nov 17, 2010 at 11:33 PM, Dave Martin dave.martin@linaro.org wrote:
FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
I'm wondering how to setup personal git tree on git.linaro.org, any wiki page for that?
BR, Jason
Searching the wiki for git.linaro.org yields:
On Thu, Nov 18, 2010 at 3:47 PM, Amit Kucheria amit.kucheria@linaro.org wrote:
On Thu, Nov 18, 2010 at 12:30 PM, Jason Hui jason.hui@linaro.org wrote:
On Wed, Nov 17, 2010 at 11:33 PM, Dave Martin dave.martin@linaro.org wrote:
FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
I'm wondering how to setup personal git tree on git.linaro.org, any wiki page for that?
BR, Jason
Searching the wiki for git.linaro.org yields:
Thanks.
I found the instructions useful... there was one anomaly though: for this bit:
Edit ".git/config" file in local tree and add following entry manually (replace <..> with proper values in below url)
* [remote "publish"]
url = ssh://<username>@git.linaro.org:~/public_git/<gitproject>.git
...it didn't work for me.
Instead I used the URL form, which works fine: ssh://<username>@git.linaro.org/home/<username>/public_git/<gitproject>.git
Also, I was able to add this with "git remote add" just fine ... what's the rationale for editing .git/config by hand?
Cheers ---Dave
On Thu, Nov 18, 2010 at 3:01 PM, Dave Martin dave.martin@linaro.org wrote:
I found the instructions useful... there was one anomaly though: for this bit:
Edit ".git/config" file in local tree and add following entry manually (replace <..> with proper values in below url)
* [remote "publish"]
url = ssh://<username>@git.linaro.org:~/public_git/<gitproject>.git
...it didn't work for me.
Instead I used the URL form, which works fine: ssh://<username>@git.linaro.org/home/<username>/public_git/<gitproject>.git
Also, I was able to add this with "git remote add" just fine ... what's the rationale for editing .git/config by hand?
Ignorance? :)
Could you update the instructions?
/Amit
Hi,
On Thu, Nov 18, 2010 at 9:56 AM, Amit Kucheria amit.kucheria@linaro.org wrote:
On Thu, Nov 18, 2010 at 3:01 PM, Dave Martin dave.martin@linaro.org wrote:
I found the instructions useful... there was one anomaly though: for this bit:
Edit ".git/config" file in local tree and add following entry manually (replace <..> with proper values in below url)
* [remote "publish"]
url = ssh://<username>@git.linaro.org:~/public_git/<gitproject>.git
...it didn't work for me.
Instead I used the URL form, which works fine: ssh://<username>@git.linaro.org/home/<username>/public_git/<gitproject>.git
Also, I was able to add this with "git remote add" just fine ... what's the rationale for editing .git/config by hand?
Ignorance? :)
Jason, are you able to confirm whether the change to the instructions is needed (and whether my version works)?
If it works for you, I can edit the wiki.
Cheers ---Dave
On Thu, Nov 18, 2010 at 10:19 PM, Dave Martin dave.martin@linaro.org wrote:
Hi,
On Thu, Nov 18, 2010 at 9:56 AM, Amit Kucheria amit.kucheria@linaro.org wrote:
On Thu, Nov 18, 2010 at 3:01 PM, Dave Martin dave.martin@linaro.org wrote:
I found the instructions useful... there was one anomaly though: for this bit:
Edit ".git/config" file in local tree and add following entry manually (replace <..> with proper values in below url)
* [remote "publish"]
url = ssh://<username>@git.linaro.org:~/public_git/<gitproject>.git
...it didn't work for me.
Instead I used the URL form, which works fine: ssh://<username>@git.linaro.org/home/<username>/public_git/<gitproject>.git
Also, I was able to add this with "git remote add" just fine ... what's the rationale for editing .git/config by hand?
Ignorance? :)
Jason, are you able to confirm whether the change to the instructions is needed (and whether my version works)?
Hi, Dave, Currently, I suffered from the FSL firewall issue which can't let us to use SSH to access outside git. So, I can't help to confirm whether this change is OK or not. Sorry for that.
If it works for you, I can edit the wiki.
Cheers ---Dave
Jason, are you able to confirm whether the change to the instructions is needed (and whether my version works)?
Hi, Dave, Currently, I suffered from the FSL firewall issue which can't let us to use SSH to access outside git. So, I can't help to confirm whether this change is OK or not. Sorry for that.
I sympathise :)
No problem - I'll add a note on the wiki suggesting the alternative method, but leave the old text there too just in case.
Cheers ---Dave
On Thu, 18 Nov 2010, Amit Kucheria wrote:
On Thu, Nov 18, 2010 at 12:30 PM, Jason Hui jason.hui@linaro.org wrote:
On Wed, Nov 17, 2010 at 11:33 PM, Dave Martin dave.martin@linaro.org wrote:
FYI, I've set up a tree with my currently posted patches, with branches currently as follows:
git://git.linaro.org/people/dmart/linux-2.6-arm.git
I'm wondering how to setup personal git tree on git.linaro.org, any wiki page for that?
BR, Jason
Searching the wiki for git.linaro.org yields:
FYI I updated the above page to reflect current practice i.e. to instruct people to add a link to their own tree under the /srv/git.linaro.org/git/people hierarchy and not /srv/git.linaro.org/git.
Nicolas
-
Amit Kucheria -
Dave Martin -
Jason Hui -
Nicolas Pitre