netdev - Re: Avoiding merge conflicts while adding new docs - Was: Re: [PATCH 00/57] Convert files to ReST

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: <20190419161058.3628a29b@lwn.net>
Date:   Fri, 19 Apr 2019 16:10:58 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
Cc:     Linux Doc Mailing List <linux-doc@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab@...radead.org>,
        linux-kernel@...r.kernel.org, linux-riscv@...ts.infradead.org,
        linux-fbdev@...r.kernel.org, linux-s390@...r.kernel.org,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-watchdog@...r.kernel.org, xdp-newbies@...r.kernel.org,
        linux-samsung-soc@...r.kernel.org, linux-acpi@...r.kernel.org,
        linux-stm32@...md-mailman.stormreply.com, bpf@...r.kernel.org,
        linux-ide@...r.kernel.org, linux-pm@...r.kernel.org,
        dri-devel@...ts.freedesktop.org, linux-scsi@...r.kernel.org,
        linux-gpio@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
        x86@...nel.org, dm-devel@...hat.com, target-devel@...r.kernel.org,
        netdev@...r.kernel.org, kexec@...ts.infradead.org,
        linux-fpga@...r.kernel.org, linux-rdma@...r.kernel.org,
        linux-kbuild@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
        linux-security-module@...r.kernel.org, linux-usb@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org
Subject: Re: Avoiding merge conflicts while adding new docs - Was: Re:
 [PATCH 00/57] Convert files to ReST

On Thu, 18 Apr 2019 09:42:23 -0300
Mauro Carvalho Chehab <mchehab+samsung@...nel.org> wrote:

> After thinking a little bit and doing some tests, I think a good solution
> would be to add ":orphan:" markup to the new .rst files that were not
> added yet into the main body (e. g. something like the enclosed example).

Interesting...I didn't know about that.  Yes, I think it makes sense to
put that in...

jon