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

Message-ID: <20170704043247.52e889ba@canb.auug.org.au>
Date:   Tue, 4 Jul 2017 04:33:00 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kamil Rytarowski <n54@....com>
Cc:     Jonathan Corbet <corbet@....net>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild
 tree

Hi Kamil,

On Mon, 3 Jul 2017 18:43:32 +0200 Kamil Rytarowski <n54@....com> wrote:
>
> Am I expected to do it myself and resend a new patch?

No, this conflict is not very hard to fix up, so Linus just needs to be
told it exists as a courtesy.

-- 
Cheers,
Stephen Rothwell