| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20091220.182910.226760127.davem@davemloft.net> Date: Sun, 20 Dec 2009 18:29:10 -0800 (PST) From: David Miller <davem@...emloft.net> To: linville@...driver.com Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: pull request: wireless-2.6 2009-12-18 From: "John W. Linville" <linville@...driver.com> Date: Sun, 20 Dec 2009 08:38:00 -0500 > On Sun, Dec 20, 2009 at 12:17:36AM -0800, David Miller wrote: >> From: "John W. Linville" <linville@...driver.com> >> Date: Fri, 18 Dec 2009 16:19:45 -0500 >> >> > Please let me know if there are problems! >> >> Your tree is based upon Linus's not net-2.6 >> so when I pulled I got a lot of unrelated >> commits. >> >> Please fix this, thanks. > > It's based on 2.6.33-rc1. Are you not going to pull that into net-2.6? Why in the world should I? There are no conflicts to resolve that I know of. And if there are no conflicts to resolve, pulling in Linus's tree just makes future pulls into his tree more ugly. This is pretty standard practice, but in any event you shouldn't ever care. You should simply always work against net-2.6, there is no reason to work against any other tree. This is a pretty fundamental thing, I don't know why you based against Linus's tree instead of net-2.6. Now you have to rebase already :-/ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists