On Fri, Jun 8, 2012 at 10:16 PM, Pekka Enberg <penberg@xxxxxxxxxx> wrote: > On Fri, Jun 8, 2012 at 10:15 PM, Sasha Levin <levinsasha928@xxxxxxxxx> wrote: >> Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> >> --- >> mm/frontswap.c | 5 +++-- >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/mm/frontswap.c b/mm/frontswap.c >> index 557e8af4..b619d29 100644 >> --- a/mm/frontswap.c >> +++ b/mm/frontswap.c >> @@ -150,6 +150,7 @@ int __frontswap_store(struct page *page) >> inc_frontswap_failed_stores(); >> } else >> inc_frontswap_failed_stores(); >> + } > > This looks wrong. Did you compile it? gah... yes, I've had an error in the merge resolution, but since that code is completely changed in next couple of patches I didn't notice it when building the final version. I really should build after each merge failure... Konrad, would it be ok if I send just a new version of this patch (if everything else is fine)? -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href