From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751369AbdKOGjw (ORCPT ); Wed, 15 Nov 2017 01:39:52 -0500 Received: from mail.efficios.com ([167.114.142.141]:35053 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750718AbdKOGjo (ORCPT ); Wed, 15 Nov 2017 01:39:44 -0500 Date: Wed, 15 Nov 2017 06:40:28 +0000 (UTC) From: Mathieu Desnoyers To: Stephen Rothwell Cc: "Paul E. McKenney" , linux-kernel Message-ID: <380080509.15535.1510728028457.JavaMail.zimbra@efficios.com> In-Reply-To: <20171115153811.429a6af2@canb.auug.org.au> References: <210317081.15258.1510703646315.JavaMail.zimbra@efficios.com> <20171115111539.68aa2539@canb.auug.org.au> <1651801506.15291.1510708924508.JavaMail.zimbra@efficios.com> <20171115153811.429a6af2@canb.auug.org.au> Subject: Re: Adding rseq tree to -next MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [167.114.142.141] X-Mailer: Zimbra 8.7.11_GA_1854 (ZimbraWebClient - FF52 (Linux)/8.7.11_GA_1854) Thread-Topic: Adding rseq tree to -next Thread-Index: bNakC/UeA7abXldrAAWiuC3Ce+ZZTw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ----- On Nov 14, 2017, at 11:38 PM, Stephen Rothwell sfr@canb.auug.org.au wrote: > Hi Mathieu, > > On Wed, 15 Nov 2017 01:22:04 +0000 (UTC) Mathieu Desnoyers > wrote: >> >> ----- On Nov 14, 2017, at 7:15 PM, Stephen Rothwell sfr@canb.auug.org.au wrote: >> >> > On Tue, 14 Nov 2017 23:54:06 +0000 (UTC) Mathieu Desnoyers >> > wrote: >> >> >> >> Would it be possible to add the "rseq" tree to -next for testing ? >> >> >> >> I prepared a branch at: >> >> >> >> https://git.kernel.org/pub/scm/linux/kernel/git/rseq/linux-rseq.git >> >> branch: rseq/for-next >> > >> > I try not to add new trees during the merge window (the only exceptions >> > are for trees that will remain empty until after the merge window >> > closes or trees only containing material for the current merge window - >> > and in that case it is a bit late and a pain if it interacts with >> > anything else). >> > >> > I will add it after -rc1 is released, though. Please remind me if I >> > forget. >> >> No worries, sorry for the short notice. I'll try to do a merge >> attempt into -next on my end before sending to Linus then. > > OK, since you intend to ask Linus to merge it during this merge window, > I have added it from today (I hope I don't regret it too much :-)). Thanks! I did attempt to do the merge with -next myself, and the conflicts were pretty much trivial to handle. One I have not seen in your messages so far is the comment added to mmdrop() on x86. The function moves from a static inline in a header to a standard function (in a C file), so the comment should move accordingly. Thank you, Mathieu > > Thanks for adding your subsystem tree as a participant of linux-next. As > you may know, this is not a judgement of your code. The purpose of > linux-next is for integration testing and to lower the impact of > conflicts between subsystems in the next merge window. > > You will need to ensure that the patches/commits in your tree/series have > been: > * submitted under GPL v2 (or later) and include the Contributor's > Signed-off-by, > * posted to the relevant mailing list, > * reviewed by you (or another maintainer of your subsystem tree), > * successfully unit tested, and > * destined for the current or next Linux merge window. > > Basically, this should be just what you would send to Linus (or ask him > to fetch). It is allowed to be rebased if you deem it necessary. > > -- > Cheers, > Stephen Rothwell > sfr@canb.auug.org.au -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com