Re: linux-next: manual merge of the vfs tree with the powerpc tree

2013-04-30 Thread Al Viro
On Wed, May 01, 2013 at 10:31:33AM +0530, Vasant Hegde wrote: > 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"

Re: linux-next: manual merge of the vfs tree with the powerpc tree

2013-04-30 Thread Vasant Hegde
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 k

Re: linux-next: manual merge of the vfs tree with the powerpc tree

2013-04-28 Thread Benjamin Herrenschmidt
On Mon, 2013-04-29 at 11:35 +1000, Stephen Rothwell wrote: > Today's linux-next merge of the vfs tree got a conflict in > arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186 > ("powerpc/rtas_flash: Free kmem upon module exit"), from the powerpc > tree and commit 5c0333c00ff6 ("ppc: Clean