From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Corbet Subject: Re: [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST Date: Wed, 25 Jul 2018 08:14:15 -0600 Message-ID: <20180725081415.373bde37@lwn.net> References: <20180725025005.14332-1-me@tobin.cc> <20180725032810.GA6067@eros> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Cc: "David S. Miller" , linux-doc@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: "Tobin C. Harding" Return-path: In-Reply-To: <20180725032810.GA6067@eros> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Wed, 25 Jul 2018 13:28:10 +1000 "Tobin C. Harding" 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