Messages in this thread | | | Subject | Re: linux-next: manual merge of the vfs tree with the powerpc tree | From | Benjamin Herrenschmidt <> | Date | Mon, 29 Apr 2013 13:40:44 +1000 |
| |
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 up rtas_flash driver > somewhat") > from the vfs tree. > > I fixed it up (see below) and can carry the fix as necessary (no > action > is required).
Please don't merge Dave's rework until it's been acked & fully tested by us. AFAIK, there are outstanding comments from my guys who reviewed/tested the first pass.
Cheers, Ben.
| |