Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
