[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <989035723.18493.1518116696482.JavaMail.zimbra@efficios.com>
Date: Thu, 8 Feb 2018 19:04:56 +0000 (UTC)
From: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To: Will Deacon <will.deacon@....com>
Cc: Ingo Molnar <mingo@...nel.org>,
Stephen Rothwell <sfr@...b.auug.org.au>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree
----- On Feb 8, 2018, at 1:56 PM, Will Deacon will.deacon@....com wrote:
> On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>>
>> * Will Deacon <will.deacon@....com> wrote:
>>
>> > For the sake of avoiding the conflict, can we just drop it for now, please?
>>
>> Yeah, so I resolved the conflict by merging the (already upstream) bits and
>> Linus
>> pulled that resolution. From now on the level of comments you want there is up
>> to
>> you! :-)
>
> Haha, ok! Mathieu -- are you still planning to add something under
> Documentation/? Regardless of my preference on comments, I think it would
> be useful.
I submitted it as RFC a few days ago, and I'm still awaiting feedback:
http://lkml.kernel.org/r/1517936413-19675-1-git-send-email-mathieu.desnoyers@efficios.com
If you guys are OK with the approach, I can submit it again, this time without the RFC
tag.
Thanks,
Mathieu
>
> Will
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
Powered by blists - more mailing lists