| 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 15:51:42 -0500 From: "John W. Linville" <linville@...driver.com> To: David Miller <davem@...emloft.net> Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: pull request: wireless-2.6 2009-11-11 On Wed, Nov 11, 2009 at 11:41:14AM -0800, David Miller wrote: > From: David Miller <davem@...emloft.net> > Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST) > > > From: "John W. Linville" <linville@...driver.com> > > Date: Wed, 11 Nov 2009 12:22:55 -0500 > > > >> P.S. Due to the aformentioned iwlwifi fix, this will cause -next > >> conflicts for sfr. You may want to pull net-2.6 into net-next-2.6 after > >> pulling this. The iwlwifi conflicts can be resolved by taking the bigger > >> hunks... > > > > Yep, I noticed this, I'll sort it out, thanks. > > I just pushed out the merge to net-next-2.6, please double > check my work. Found a little merge damage, sent a fixup patch to netdev@...r.kernel.org... Thanks! Sorry if I gave bad merge conflict fixup advice... 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