Subject: Re: [PATCH v2 1/1] doc: networking: integrate scaling document into doc tree

From: Otto Sabart <[email-masked]>
Date: Mon, 21 Jan 2019 08:30:20 +0100

On 20. Jan (Sunday) v 19:13:59 -0700 2019, Jonathan Corbet wrote:
> On Fri, 18 Jan 2019 21:38:32 +0100
> Otto Sabart <[email-masked]> wrote:
> 
> > Convert scaling document into reStructuredText and add reference to
> > scaling document into main table of contents in network documentation.
> > 
> > There are no semantic changes.
> > 
> > There are no references to "scaling.txt" file. Whole kernel tree was
> > checked using:
> > $ grep -r "scaling\.txt"
> > 
> > Signed-off-by: Otto Sabart <[email-masked]>
> 
> So this didn't apply cleanly to docs-next due to a conflict with
> commit d96bedb2b248 ("doc: networking: add offload documents into main
> index file") by one Otto Sabart.

Yeah, .. I always just checked if it merges cleanly against the Linus's
tree.

> I've fixed that up, but in the future it will be helpful if you can be
> sure that your patches are against the docs tree if you want me to
> merge them.

Will do. Thank you Jon and sorry for the merge conflict.

Ota