[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <380080509.15535.1510728028457.JavaMail.zimbra@efficios.com>
Date: Wed, 15 Nov 2017 06:40:28 +0000 (UTC)
From: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: Adding rseq tree to -next
----- On Nov 14, 2017, at 11:38 PM, Stephen Rothwell sfr@...b.auug.org.au wrote:
> Hi Mathieu,
>
> On Wed, 15 Nov 2017 01:22:04 +0000 (UTC) Mathieu Desnoyers
> <mathieu.desnoyers@...icios.com> wrote:
>>
>> ----- On Nov 14, 2017, at 7:15 PM, Stephen Rothwell sfr@...b.auug.org.au wrote:
>>
>> > On Tue, 14 Nov 2017 23:54:06 +0000 (UTC) Mathieu Desnoyers
>> > <mathieu.desnoyers@...icios.com> 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@...b.auug.org.au
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
Powered by blists - more mailing lists