| 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: <20070810214340.GA28812@tuxdriver.com> Date: Fri, 10 Aug 2007 17:43:40 -0400 From: "John W. Linville" <linville@...driver.com> To: Andrew Morton <akpm@...ux-foundation.org> Cc: Aurelien Jarno <aurelien@...el32.net>, Michael Buesch <mb@...sch.de>, linux-kernel@...r.kernel.org, linux-wireless@...r.kernel.org Subject: Re: 2.6.23-rc2-mm2 On Fri, Aug 10, 2007 at 01:20:19PM -0700, Andrew Morton wrote: > git-wireless now has the usual git catastrophe when merging it against the > recently-discovered net-2.6.24 tree, so I'll need to do something about > that first. I have rebased the wireless-dev tree, and the mm-master branch there should specifically avoid these merge conflicts. Hth! John -- John W. Linville linville@...driver.com - 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