From: Otto Sabart <ottosabart@seberm.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH v2 1/1] doc: networking: integrate scaling document into doc tree
Date: Mon, 21 Jan 2019 08:30:20 +0100 [thread overview]
Message-ID: <20190121073020.GA10146@personal> (raw)
In-Reply-To: <20190120191359.41e5de0c@lwn.net>
[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]
On 20. Jan (Sunday) v 19:13:59 -0700 2019, Jonathan Corbet wrote:
> On Fri, 18 Jan 2019 21:38:32 +0100
> Otto Sabart <ottosabart@seberm.com> 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 <ottosabart@seberm.com>
>
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2019-01-21 7:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 20:38 [PATCH v2 0/1] doc: networking: integrate scaling document into doc tree Otto Sabart
2019-01-18 20:38 ` [PATCH v2 1/1] " Otto Sabart
2019-01-21 2:13 ` Jonathan Corbet
2019-01-21 7:30 ` Otto Sabart [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190121073020.GA10146@personal \
--to=ottosabart@seberm.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).