linux-kernel - Re: linux-next: manual merge of the jc

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160819115009.354453a6@lwn.net>
Date:   Fri, 19 Aug 2016 11:50:09 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Markus Heiser <markus.heiser@...marIT.de>
Subject: Re: linux-next: manual merge of the jc_docs tree with the drm-misc
 tree

On Fri, 19 Aug 2016 11:52:15 +1000
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/gpu/index.rst
> 
> between commit:
> 
>   b754b35b089d ("vgaarbiter: rst-ifiy and polish kerneldoc")
> 
> from the drm-misc tree and commit:
> 
>   505f711174b0 ("doc-rst: add index to sub-folders")
> 
> from the jc_docs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix is good.

Daniel: my apologies, I should have asked for that patch to be split up
and the relevant pieces sent through the gpu and media trees.

jon