linux-kernel - Re: linux-next: manual merge of the mm tree with 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: <87wn4kl0w0.fsf@meer.lwn.net>
Date:   Tue, 14 Feb 2023 08:31:11 -0700
From:   Jonathan Corbet <corbet@....net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Wang Yong <wang.yong12@....com.cn>,
        Yanteng Si <siyanteng@...ngson.cn>
Subject: Re: linux-next: manual merge of the mm tree with the jc_docs tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
>   Documentation/translations/zh_CN/accounting/delay-accounting.rst
>
> between commit:
>
>   6ab587e8e8b4 ("docs/zh_CN: Update the translation of delay-accounting to 6.1-rc8")
>
> from the jc_docs tree and commit:
>
>   f66f8a7e4730 ("delayacct: improve the average delay precision of getdelay tool to microsecond")
>
> from the mm tree.

This has really been one of those cycles, hasn't it?

Thanks for all the resolutions; I think I may have to offer Linus a
special branch just to keep him from going nuts with all of these.

jon