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, 28 Feb 2012 11:04:42 +0530 From: Srikar Dronamraju <srikar@...ux.vnet.ibm.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Jim Keniston <jkenisto@...ibm.com>, Oleg Nesterov <oleg@...hat.com> Subject: Re: linux-next: manual merge of the uprobes tree with Linus' tree Hi Stephen, > Today's linux-next merge of the uprobes tree got a conflict in > kernel/fork.c between commit d80e731ecab4 ("epoll: introduce POLLFREE to > flush ->signalfd_wqh before kfree()") from Linus' tree and commit > 1f9eb65410a6 ("uprobes/core: handle breakpoint and signal step > exception") from the uprobes tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Okay, Thanks for letting me know. I will fix this up accordingly. -- 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