Messages in this thread | | | Date | Wed, 1 May 2013 06:10:14 +0100 | From | Al Viro <> | Subject | Re: linux-next: manual merge of the vfs tree with the powerpc tree |
| |
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") 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.
What the hell? Your fixes *are* folded into that commit and according to Ben it passes testing; is there anything still missing?
| |