From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Wang Yong <wang.yong12@zte•com.cn>,
Yanteng Si <siyanteng@loongson•cn>
Subject: linux-next: manual merge of the mm tree with the jc_docs tree
Date: Tue, 14 Feb 2023 13:39:29 +1100 [thread overview]
Message-ID: <20230214133929.7d8ed00f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2583 bytes --]
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.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
I also aligned the last 2 lines with the lines above.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/translations/zh_CN/accounting/delay-accounting.rst
index a01dc3d5b0db,5623f555d7c5..000000000000
--- a/Documentation/translations/zh_CN/accounting/delay-accounting.rst
+++ b/Documentation/translations/zh_CN/accounting/delay-accounting.rst
@@@ -92,17 -91,15 +92,17 @@@ getdelays命令的一般格式:
CPU count real total virtual total delay total delay average
8 7000000 6872122 3382277 0.423ms
IO count delay total delay average
- 0 0 0ms
+ 0 0 0.000ms
SWAP count delay total delay average
- 0 0 0ms
+ 0 0 0.000ms
RECLAIM count delay total delay average
- 0 0 0ms
+ 0 0 0.000ms
THRASHING count delay total delay average
- 0 0 0ms
+ 0 0 0.000ms
COMPACT count delay total delay average
- 0 0 0ms
- WPCOPY count delay total delay average
- 0 0 0ms
+ 0 0 0.000ms
++ WPCOPY count delay total delay average
++ 0 0 0.000ms
获取pid为1的IO计数，它只和-p一起使用::
# ./getdelays -i -p 1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-14 2:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 2:39 Stephen Rothwell [this message]
2023-02-14 15:31 ` linux-next: manual merge of the mm tree with the jc_docs tree Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230214133929.7d8ed00f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=siyanteng@loongson$(echo .)cn \
--cc=wang.yong12@zte$(echo .)com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox