From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Desnoyers Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Date: Fri, 9 Feb 2018 20:35:45 +0000 (UTC) Message-ID: <1504422181.19125.1518208545731.JavaMail.zimbra@efficios.com> References: <20180206114048.6c8ced1c@canb.auug.org.au> <20180206135512.GB22740@arm.com> <1815310787.16844.1517926010063.JavaMail.zimbra@efficios.com> <20180206141118.GC22740@arm.com> <20180208070350.mxirhg32zljp2e4k@gmail.com> <20180208185637.GB16314@arm.com> <989035723.18493.1518116696482.JavaMail.zimbra@efficios.com> <20180209182530.GB21542@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mail.efficios.com ([167.114.142.141]:55193 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbeBIUe4 (ORCPT ); Fri, 9 Feb 2018 15:34:56 -0500 In-Reply-To: <20180209182530.GB21542@arm.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Will Deacon , Ingo Molnar Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , linux-kernel ----- On Feb 9, 2018, at 1:25 PM, Will Deacon will.deacon@arm.com wrote: > On Thu, Feb 08, 2018 at 07:04:56PM +0000, Mathieu Desnoyers wrote: >> ----- On Feb 8, 2018, at 1:56 PM, Will Deacon will.deacon@arm.com wrote: >> >> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote: >> >> >> >> * Will Deacon 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. > > Yes, please! Done: https://lkml.kernel.org/r/1518208256-22034-1-git-send-email-mathieu.desnoyers@efficios.com Let's see what Thomas/Ingo/PeterZ have to say about this approach to documentation. Ingo, if you are OK with it, this feature documentation patch could go through the scheduler tree. Thanks, Mathieu -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com