From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the akpm-current tree with the tip tree Date: Wed, 9 Sep 2015 08:56:03 +1000 Message-ID: <20150909085603.0173ac4e@canb.auug.org.au> References: <20150728160015.142f588f@canb.auug.org.au> <20150729171256.GA10863@redhat.com> <20150908093524.507a19d8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:44342 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264AbbIHW4F (ORCPT ); Tue, 8 Sep 2015 18:56:05 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Torvalds Cc: Andrea Arcangeli , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next , Linux Kernel Mailing List , Andy Lutomirski , Eric B Munson , "Dr. David Alan Gilbert" Hi Linus, On Tue, 8 Sep 2015 11:11:25 -0700 Linus Torvalds wrote: > > On Mon, Sep 7, 2015 at 4:35 PM, Stephen Rothwell 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