Messages in this thread | | | Date | Thu, 8 Feb 2018 18:56:38 +0000 | From | Will Deacon <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree |
| |
On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote: > > * Will Deacon <will.deacon@arm.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.
Will
| |