From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx145.postini.com [74.125.245.145]) by kanga.kvack.org (Postfix) with SMTP id EE3376B0062 for ; Fri, 8 Jun 2012 16:36:36 -0400 (EDT) Received: by yhr47 with SMTP id 47so2132938yhr.14 for ; Fri, 08 Jun 2012 13:36:36 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <1339182919-11432-1-git-send-email-levinsasha928@gmail.com> <1339182919-11432-3-git-send-email-levinsasha928@gmail.com> From: Sasha Levin Date: Fri, 8 Jun 2012 22:36:14 +0200 Message-ID: Subject: Re: [PATCH v2 02/10] mm: frontswap: trivial coding convention issues Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org List-ID: To: Pekka Enberg Cc: dan.magenheimer@oracle.com, konrad.wilk@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org On Fri, Jun 8, 2012 at 10:16 PM, Pekka Enberg wrote: > On Fri, Jun 8, 2012 at 10:15 PM, Sasha Levin wr= ote: >> Signed-off-by: Sasha Levin >> --- >> =A0mm/frontswap.c | =A0 =A05 +++-- >> =A01 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) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0inc_frontswap_failed_stores(); >> =A0 =A0 =A0 =A0} else >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0inc_frontswap_failed_stores(); >> + =A0 =A0 =A0 } > > 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@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org