Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964821Ab2FHUgl (ORCPT ); Fri, 8 Jun 2012 16:36:41 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:62487 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934438Ab2FHUgk convert rfc822-to-8bit (ORCPT ); Fri, 8 Jun 2012 16:36:40 -0400 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 To: Pekka Enberg Cc: dan.magenheimer@oracle.com, konrad.wilk@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1237 Lines: 31 On Fri, Jun 8, 2012 at 10:16 PM, Pekka Enberg wrote: > On Fri, Jun 8, 2012 at 10:15 PM, Sasha Levin wrote: >> Signed-off-by: Sasha Levin >> --- >> ?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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/