From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210AbeBHTEK (ORCPT ); Thu, 8 Feb 2018 14:04:10 -0500 Received: from mail.efficios.com ([167.114.142.141]:40852 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751544AbeBHTEI (ORCPT ); Thu, 8 Feb 2018 14:04:08 -0500 Date: Thu, 8 Feb 2018 19:04:56 +0000 (UTC) From: Mathieu Desnoyers To: Will Deacon Cc: Ingo Molnar , Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , linux-kernel Message-ID: <989035723.18493.1518116696482.JavaMail.zimbra@efficios.com> In-Reply-To: <20180208185637.GB16314@arm.com> References: <20180206114048.6c8ced1c@canb.auug.org.au> <750091485.16756.1517921554396.JavaMail.zimbra@efficios.com> <20180206135512.GB22740@arm.com> <1815310787.16844.1517926010063.JavaMail.zimbra@efficios.com> <20180206141118.GC22740@arm.com> <20180208070350.mxirhg32zljp2e4k@gmail.com> <20180208185637.GB16314@arm.com> Subject: Re: linux-next: manual merge of the tip tree with Linus' tree 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: linux-next: manual merge of the tip tree with Linus' tree Thread-Index: Pd48GZLaS4EM9B8eZq6y5lwvdnxSPA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ----- 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. Thanks, Mathieu > > Will -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com