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:
pgppSJqFPzTl5.pgp
Description: OpenPGP digital signature
