Re: linux-next: manual merge of the tip tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



----- On Feb 9, 2018, at 1:25 PM, Will Deacon will.deacon@xxxxxxx 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@xxxxxxx wrote:
>> 
>> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>> >> 
>> >> * Will Deacon <will.deacon@xxxxxxx> 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@xxxxxxxxxxxx
>> 
>> 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@xxxxxxxxxxxx

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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux