Re: New GIT net tree naming...
From: Tomas Winkler <hidden>
Date: 2008-05-13 10:05:22
Also in:
linux-wireless
On Mon, May 12, 2008 at 9:47 PM, John W. Linville [off-list ref] 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html