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
| ||
|
Date: Wed, 11 Nov 2009 09:54:32 -0500 From: "John W. Linville" <linville@...driver.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Wey-Yi Guy <wey-yi.w.guy@...el.com> Subject: Re: linux-next: manual merge of the net/wireless trees with the wireless-current tree On Wed, Nov 11, 2009 at 01:01:19PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got conflicts in > drivers/net/wireless/iwlwifi/iwl-1000.c, > drivers/net/wireless/iwlwifi/iwl-6000.c and > drivers/net/wireless/iwlwifi/iwl-core.h between commits in the > wireless-current tree and commits in the net (wireless) tree. > > I used the versions from the net tree except where obvious additions > had been made in the wireless-current tree. The fixes may not be > correct - someone should merge the wireless-current tree into the > net tree. Yeah, these conflicts should all be resolved by taking the bigger hunk. The smaller hunk is duplicative because a patch that has already been sent to net-next-2.6 is going to be sent for net-2.6 as well (to support a regression fix). I'll probably send the wireless-2.6 pull request today. Perhaps after Dave pulls that (and Linus pulls from him), Dave can pull net-2.6 into net-next-2.6 to resolve the issue. John -- John W. Linville Someday the world will need a hero, and you linville@...driver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists