| 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: <20100723213931.GF2426@tuxdriver.com> Date: Fri, 23 Jul 2010 17:39:31 -0400 From: "John W. Linville" <linville@...driver.com> To: David Miller <davem@...emloft.net> Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org Subject: Re: pull request: wireless-next-2.6 2010-07-23 On Fri, Jul 23, 2010 at 02:03:20PM -0700, David Miller wrote: > From: "John W. Linville" <linville@...driver.com> > Date: Fri, 23 Jul 2010 16:40:29 -0400 > > > Yet another batch intended for 2.6.36... Mostly the usual random lot > > of stuff, mostly driver updates. This batch also includes a flurry > > of Sparse-inspired patches from me -- it is hard to resist once the > > "bug" bites! As usual, all of these have been cooking in linux-next > > for at least several days. > > > > Please let me know if there are problems! > > Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h > CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-commands.h > > I don't even have to look at the file to know that it's > another one of those __packed things. > > I'll fix it up again, but I know you can sense how tiring > this has become for me. I'm sorry, Dave! I should have done a for-davem branch. FWIW, I intended to do a test merge but it must have slipped my fragile mind. :-( 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 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