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: Fri, 02 Mar 2012 13:51:30 +0800 From: Cong Wang <amwang@...hat.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, ". Seth Jennings" <sjenning@...ux.vnet.ibm.com> Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging tree On Thu, 2012-03-01 at 17:07 +1100, Stephen Rothwell wrote: > Hi Cong, > > Today's linux-next merge of the kmap_atomic tree got a conflict in > drivers/staging/zcache/zcache-main.c between various commits from the > staging tree and commit 1edbcaee3bbe ("zcache: remove the second argument > of k[un]map_atomic()") from the kmap_atomic tree. > > I fixed it up (see below) and can carry the fix as necessary. Hi, Stephen, Sorry for the delay, it looks correct to me. Thanks! -- 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