Re: linux-next: manual merge of the akpm-current tree with the tip tree
From: Linus Torvalds
Date: Tue Sep 08 2015 - 14:11:43 EST
On Mon, Sep 7, 2015 at 4:35 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> The below patch was missed when the userfaultfd stuff and the x86 changes
> were merged. I have repeated the patch in the clear below.
When forwarding patches, please add your sign-off. I can see (and
apply) the original in this thread, so I guess it doesn't matter in
this particular case, but in general that's what you should be doing
so that I don't then have to find the other email just to apply the
patch from the original author.
Also, this wasn't actually a real merge error. This was just a bug in
the whole process. Andrew's patches sent to me had been updated with
the right number for all the other cases, why hadn't this been folded
into the series too? Apparently Andrew's series has simply been buggy
for the last month or more, and that was true even before it was sent
to me and while it was cooking in -next.. Tssk.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/