From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: linux-next: manual merge of the akpm-current tree with the tip tree Date: Tue, 8 Sep 2015 16:21:15 -0700 Message-ID: <20150908162115.fc494463.akpm@linux-foundation.org> References: <20150728160015.142f588f@canb.auug.org.au> <20150729171256.GA10863@redhat.com> <20150908093524.507a19d8@canb.auug.org.au> <20150909085603.0173ac4e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35344 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751912AbbIHXUQ (ORCPT ); Tue, 8 Sep 2015 19:20:16 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Torvalds Cc: Stephen Rothwell , Andrea Arcangeli , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next , Linux Kernel Mailing List , Andy Lutomirski , Eric B Munson , "Dr. David Alan Gilbert" On Tue, 8 Sep 2015 16:03:23 -0700 Linus Torvalds wrote: > On Tue, Sep 8, 2015 at 3:56 PM, Stephen Rothwell wrote: > > > > 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. > > I suspect Andrew saw that patch, and thought it was a merge fixup like > you sometimes send out, and didn't realize that it actually applied > directly to his series. I've had it all the time, as a post-linux-next fixup - the idea being that I send it to you after its linux-next preconditions have been merged up. However I failed to put that patch inside the stephen-take-these-bits markers, so it never went from -mm into -next. New syscalls are rather a pain, both from the patch-monkeying POV and also because nobody knows what the syscall numbers will be until everything lands in mainline. Oh well, it doesn't happen often and it's easy stuff.