linux-kernel - linux-next: bad merge in 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-next>] [day] [month] [year] [list]

Message-ID: <20161028103029.1e147f3e@canb.auug.org.au>
Date:   Fri, 28 Oct 2016 10:30:29 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: bad merge in the jc_docs tree

Hi Jon,

I noticed that you left some conflict markers in
Documentation/admin-guide/index.rst in merge commit

  7a6992dc952e ("Merge branch 'doc-tweaks' into docs-next")

-- 
Cheers,
Stephen Rothwell