From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mulyadi Santosa <mulyadi.santosa@gmail.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: manual merge of the trivial tree with Linus' tree
Date: Mon, 8 Mar 2010 13:20:43 +1100 [thread overview]
Message-ID: <20100308132043.f6dcc0cd.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/filesystems/proc.txt between commit
34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of
mm_counter") from Linus' tree and commit
cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 ("doc: typo - Table 1-2 should
refer to "status", not "statm"") from the trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/filesystems/proc.txt
index 96a44dd,bb314f6..0000000
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -189,13 -188,7 +189,13 @@@ memory usage. Its seven fields are expl
contains details information about the process itself. Its fields are
explained in Table 1-4.
+(for SMP CONFIG users)
+For making accounting scalable, RSS related information are handled in
+asynchronous manner and the vaule may not be very precise. To see a precise
+snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
+It's slow but very precise.
+
- Table 1-2: Contents of the statm files (as of 2.6.30-rc7)
+ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
..............................................................................
Field Content
Name filename of the executable
next reply other threads:[~2010-03-08 2:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-08 2:20 Stephen Rothwell [this message]
2010-03-08 2:41 ` linux-next: manual merge of the trivial tree with Linus' tree Mulyadi Santosa
2010-08-10 2:11 Stephen Rothwell
2010-08-10 11:22 ` Jiri Kosina
2010-11-09 2:31 Stephen Rothwell
2010-11-15 12:40 ` Jiri Kosina
2011-02-28 4:21 Stephen Rothwell
2012-03-29 1:48 Stephen Rothwell
2012-04-04 2:03 Stephen Rothwell
2012-06-29 4:36 Stephen Rothwell
2012-06-29 12:48 ` Jiri Kosina
2013-07-03 5:29 Stephen Rothwell
2013-12-24 2:49 Stephen Rothwell
2014-05-06 3:52 Stephen Rothwell
2014-08-26 4:29 Stephen Rothwell
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=20100308132043.f6dcc0cd.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jkosina@suse.cz \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mulyadi.santosa@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).