Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755212Ab3FFHXQ (ORCPT ); Thu, 6 Jun 2013 03:23:16 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:57198 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754879Ab3FFHXL (ORCPT ); Thu, 6 Jun 2013 03:23:11 -0400 MIME-Version: 1.0 In-Reply-To: <20130606120455.bd86a4c0ac009482db80f634@canb.auug.org.au> References: <20130606002636.6746F5A41AE@corp2gmr1-2.hot.corp.google.com> <20130606120455.bd86a4c0ac009482db80f634@canb.auug.org.au> Date: Thu, 6 Jun 2013 09:23:10 +0200 X-Google-Sender-Auth: NJaE0sZBeWdj4cGAdPvUkepqrZE Message-ID: Subject: Re: mmotm 2013-06-05-17-24 uploaded From: Geert Uytterhoeven To: Stephen Rothwell , Andrew Morton Cc: mm-commits@vger.kernel.org, "linux-kernel@vger.kernel.org" , Linux MM , Linux FS Devel , Linux-Next Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1271 Lines: 32 Hi Andrew, On Thu, Jun 6, 2013 at 4:04 AM, Stephen Rothwell wrote: > On Wed, 05 Jun 2013 17:26:36 -0700 akpm@linux-foundation.org wrote: >> >> linux-next-git-rejects.patch > > We must figure out why you sometimes get rejects that I do not get when I > import your series into a git tree. However in this case you resolution > is not quite right. It leaves 2 continue statements in > net/mac80211/iface.c at line 191 which will unconditionally short circuit > the enclosing loop. The version that will be in linux-next today is > correct (and git did it automatically as part of the merge of the old > linux-next tree). Do you have "git rerere" enabled? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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/