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: Wed, 01 May 2013 10:31:33 +0530 From: Vasant Hegde <hegdevasant@...ux.vnet.ibm.com> To: Stephen Rothwell <sfr@...b.auug.org.au> CC: Al Viro <viro@...IV.linux.org.uk>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, linuxppc-dev@...ts.ozlabs.org Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree On 05/01/2013 07:36 AM, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the vfs tree got a conflict in > arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573 > ("powerpc/rtas_flash: Fix bad memory access") from the powerpc tree and > commits ad18a364f186 ("powerpc/rtas_flash: Free kmem upon module exit") > and 2352ad01409d ("ppc: Clean up rtas_flash driver somewhat") from the > vfs tree. > Stephen, As Ben mentioned earlier, there are outstanding comments from me which needs to be addressed by Dave, before its merged. -Vasant > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > -- 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