netdev - Re: [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180725223133.GE6067@eros>
Date:   Thu, 26 Jul 2018 08:31:33 +1000
From:   "Tobin C. Harding" <me@...in.cc>
To:     Jonathan Corbet <corbet@....net>
Cc:     "David S. Miller" <davem@...emloft.net>, linux-doc@...r.kernel.org,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next 0/2] docs: net: Convert netdev-FAQ to RST

On Wed, Jul 25, 2018 at 08:14:15AM -0600, Jonathan Corbet wrote:
> On Wed, 25 Jul 2018 13:28:10 +1000
> "Tobin C. Harding" <me@...in.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.

Ok, I'll re-spin with all references fixed.

> And to answer your other question, yes of course it's fine (and expected)
> for this to go through Dave's tree.

And accept abuse for all merge conflicts in person at Plumbers in November :)

Thanks,
Tobin.