Re: New GIT net tree naming...

Re: New GIT net tree naming...

[John W. Linville]

On Sat, Apr 19, 2008 at 05:35:10PM -0700, David Miller wrote:
> 
> Based upon feedback from Andrew and others I'm now starting
> to use a new naming scheme for my GIT trees:
> 
> For changes against Linus's current tree:
> 
>    master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
> 
> For development meant to be merged in the next merge
> window we have:
> 
>    master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git
> 
> Andrew/Stephen, let me know if this works for you.  This way
> the tree names will never change.

I have adopted this same scheme for wireless as well:

For changes against Linus's current tree:

   master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

For development meant to be merged in the next merge
window we have:

   master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git

John
-- 
John W. Linville
linville@tuxdriver.com

Re: New GIT net tree naming...

[Holger Schurig]

> For changes against Linus's current tree:
...
> For development meant to be merged in the next merge
> window we have:

Is this relevant for us, the patch submitters?  Or should we 
continue to create patches against wireless-testing?

Re: New GIT net tree naming...

[John W. Linville]

On Thu, May 08, 2008 at 09:06:29AM +0200, Holger Schurig wrote:
> > For changes against Linus's current tree:
> ...
> > For development meant to be merged in the next merge
> > window we have:
> 
> Is this relevant for us, the patch submitters?  Or should we 
> continue to create patches against wireless-testing?

Please continue to use wireless-testing.

Thanks!

JOhn
-- 
John W. Linville
linville@tuxdriver.com

Re: New GIT net tree naming...

[Tomas Winkler]

On Thu, May 8, 2008 at 5:40 PM, John W. Linville <linville@tuxdriver.com> wrote:
> On Thu, May 08, 2008 at 09:06:29AM +0200, Holger Schurig wrote:
>> > For changes against Linus's current tree:
>> ...
>> > For development meant to be merged in the next merge
>> > window we have:
>>
>> Is this relevant for us, the patch submitters?  Or should we
>> continue to create patches against wireless-testing?
>
> Please continue to use wireless-testing.
>
> Thanks!
>
John
How would you want me to handle bug fixes to go both directions
wireless-testing and upstream?
Because of huge code movement we are now doing in iwlwifi they are
currently just not the same.
Shell I send two versions or you want to back port them not sure how
do you want to track this...somewhere in merging loop it will create a
conflict.  Maybe this is maintainer trivia anyhow
I would like to make sure there are not glitches.

Thanks
Tomas

Thanks
Tomas

> JOhn
> --
> John W. Linville
> linville@tuxdriver.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: New GIT net tree naming...

[John W. Linville]

On Mon, May 12, 2008 at 08:39:22PM +0300, Tomas Winkler wrote:

> How would you want me to handle bug fixes to go both directions
> wireless-testing and upstream?
> Because of huge code movement we are now doing in iwlwifi they are
> currently just not the same.
> Shell I send two versions or you want to back port them not sure how
> do you want to track this...somewhere in merging loop it will create a
> conflict.  Maybe this is maintainer trivia anyhow
> I would like to make sure there are not glitches.

It is a good question -- thanks for asking!

If you think that two versions of the fix are appropriate, then please
do send them.  If it is simply because the code moved I'll probably
be able to figure it out, but if the code has actually changed it
may be worthwhile.

We are now trying to avoid rebasing "-next" patches as much as possible.
So the version for the current release will be merged to Linus and I or
Dave will have to figure-out how to resolve the merge conflicts when
current is pulled to -next.  Providing a "-next' version of the patch
can help to make sure that those merge conflicts are handled correctly.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: New GIT net tree naming...

[Tomas Winkler]

On Mon, May 12, 2008 at 9:47 PM, John W. Linville
<linville@tuxdriver.com> wrote:
> On Mon, May 12, 2008 at 08:39:22PM +0300, Tomas Winkler wrote:
>
>  > How would you want me to handle bug fixes to go both directions
>  > wireless-testing and upstream?
>  > Because of huge code movement we are now doing in iwlwifi they are
>  > currently just not the same.
>  > Shell I send two versions or you want to back port them not sure how
>  > do you want to track this...somewhere in merging loop it will create a
>  > conflict.  Maybe this is maintainer trivia anyhow
>  > I would like to make sure there are not glitches.
>
>  It is a good question -- thanks for asking!
>
>  If you think that two versions of the fix are appropriate, then please
>  do send them.  If it is simply because the code moved I'll probably
>  be able to figure it out, but if the code has actually changed it
>  may be worthwhile.
>
>  We are now trying to avoid rebasing "-next" patches as much as possible.
>  So the version for the current release will be merged to Linus and I or
>  Dave will have to figure-out how to resolve the merge conflicts when
>  current is pulled to -next.  Providing a "-next' version of the patch
>  can help to make sure that those merge conflicts are handled correctly.
>
>  John

I'm not able to clone neither wireless-2.6.git nor net-2.6.git through http
I'm behind a firewall so git protocol is not an option


git-clone  ttp://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
Initialized empty Git repository in ....
Cannot get remote repository information.
Perhaps git-update-server-info needs to be run there?

git-clone  http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gi
Getting pack list for
http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
Getting index for pack 1c206683ae18d8f0b4833dcee50c8e1c76832df9
Getting pack list for
http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
error: Unable to find 090b293b87792a815cf51aeccb590ec37c90cfa3 under
http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
Cannot obtain needed blob 090b293b87792a815cf51aeccb590ec37c90cfa3
while processing commit 6e40a915de82e00d18f75941e531b40c4e0d94c4.
Waiting for http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git//objects/9a/eb872460a5dcab8b4baf13125d0177f865f393
got 334974abd063c20dc64dd32724425be36b90cebc
got 9aeb872460a5dcab8b4baf13125d0177f865f393
Waiting for http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git//objects/ab/ef366d1ab8fe2ac484039976600938f6c76db3
Received DONE message for unknown request!


Thanks
Tomas

Re: New GIT net tree naming...

[John W. Linville]

On Tue, May 13, 2008 at 01:05:22PM +0300, Tomas Winkler wrote:

> I'm not able to clone neither wireless-2.6.git nor net-2.6.git through http
> I'm behind a firewall so git protocol is not an option
> 
> 
> git-clone  ttp://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
> Initialized empty Git repository in ....
> Cannot get remote repository information.
> Perhaps git-update-server-info needs to be run there?
> 
> git-clone  http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gi
> Getting pack list for
> http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
> Getting index for pack 1c206683ae18d8f0b4833dcee50c8e1c76832df9
> Getting pack list for
> http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
> error: Unable to find 090b293b87792a815cf51aeccb590ec37c90cfa3 under
> http://www.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
> Cannot obtain needed blob 090b293b87792a815cf51aeccb590ec37c90cfa3
> while processing commit 6e40a915de82e00d18f75941e531b40c4e0d94c4.
> Waiting for http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git//objects/9a/eb872460a5dcab8b4baf13125d0177f865f393
> got 334974abd063c20dc64dd32724425be36b90cebc
> got 9aeb872460a5dcab8b4baf13125d0177f865f393
> Waiting for http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git//objects/ab/ef366d1ab8fe2ac484039976600938f6c76db3
> Received DONE message for unknown request!

I got a similar message when trying to clone using http://.  I was
able to clone using git:// without a problem.

FWIW I have the post-update hook enabled, and I didn't change my
normal practices for publishing trees on kernel.org.  I'm not sure
what is happening.  Anyone have an idea as to what is happening?

John
-- 
John W. Linville
linville@tuxdriver.com

Re: New GIT net tree naming...

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

Hi John,

On Wed, 7 May 2008 21:43:58 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I have adopted this same scheme for wireless as well:
> 
> For changes against Linus's current tree:
> 
>    master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

This is now wireless-current in linux-next.

> For development meant to be merged in the next merge
> window we have:
> 
>    master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git

This is now wireless in linux-next.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]