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: Tue, 8 Dec 2009 01:34:30 +0000 From: Ben Dooks <ben@...nity.fluff.org> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Ben Dooks <ben-linux@...ff.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the samsung tree On Tue, Dec 08, 2009 at 11:17:22AM +1100, Stephen Rothwell wrote: > Hi Ben, > > In today's linux-next merge of the samsung tree I noticed that the file > arch/arm/plat-s3c/dev-hsmmc2.c actually has some merge conflict artifacts > in it. > > I fixed them up (just by using the version from the arm tree) but it > would be good if this could be fixed in your tree as well (I notice that > Russell has already merged a (presumable) correct version of these files). I belive so, I've updated next-samsung from my for-rmk tree and added the rebased new trees to it which should fix it. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. -- 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