Messages in this thread | | | Date | Wed, 9 Sep 2015 08:56:03 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the tip tree |
| |
Hi Linus,
On Tue, 8 Sep 2015 11:11:25 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Mon, Sep 7, 2015 at 4:35 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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.
Ooops, sorry about that. I really should know better.
> 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.
I have been applying that patch I sent to you to -next for some time. I guess I expected Andrew to pick it up when he rebased his patch series before submitting it to you. These things sometimes slip through the cracks.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |