From: Jonathan Corbet <corbet@lwn.net>
To: "Tobin C. Harding" <me@tobin.cc>
Cc: "David S. Miller" <davem@davemloft.net>,
linux-doc@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST
Date: Wed, 25 Jul 2018 08:14:15 -0600 [thread overview]
Message-ID: <20180725081415.373bde37@lwn.net> (raw)
In-Reply-To: <20180725032810.GA6067@eros>
On Wed, 25 Jul 2018 13:28:10 +1000
"Tobin C. Harding" <me@tobin.cc> wrote:
> Since I've already botched it can I ask for guidance here. The problem
> is updating the links means making changes that will cause merge
> conflicts if they go through net-dev tree (since most references are in
> Documentation/*.rst). But we can't go through docs tree either since
> that could lead to merge conflicts later as well.
Merge conflicts are a way of life in Documentation/ - everybody messes
with it. They are usually pretty easy to resolve.
I only see a handful of references to netdev-FAQ.txt in the tree; I would
suggest just making the change and being done with it. There shouldn't be
any need to do a more complicated dance than that.
And to answer your other question, yes of course it's fine (and expected)
for this to go through Dave's tree.
Thanks,
jon
next prev parent reply other threads:[~2018-07-25 14:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 2:50 [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST Tobin C. Harding
2018-07-25 2:50 ` [PATCH net-next 1/2] docs: Add rest label the_canonical_path_format Tobin C. Harding
2018-07-25 14:36 ` Edward Cree
2018-07-25 22:26 ` Tobin C. Harding
2018-07-25 2:50 ` [PATCH net-next 2/2] docs: net: Convert netdev-FAQ to restructured text Tobin C. Harding
2018-07-25 3:28 ` [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST Tobin C. Harding
2018-07-25 14:14 ` Jonathan Corbet [this message]
2018-07-25 22:31 ` Tobin C. Harding
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=20180725081415.373bde37@lwn.net \
--to=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=me@tobin.cc \
--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).