Messages in this thread | | | Date | Thu, 6 Jun 2013 09:23:10 +0200 | Subject | Re: mmotm 2013-06-05-17-24 uploaded | From | Geert Uytterhoeven <> |
| |
Hi Andrew,
On Thu, Jun 6, 2013 at 4:04 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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
| |