From: Mulyadi Santosa <mulyadi.santosa@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jkosina@suse.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the trivial tree with Linus' tree
Date: Mon, 8 Mar 2010 09:41:53 +0700 [thread overview]
Message-ID: <f284c33d1003071841n617191e6vade447b3413ee9f9@mail.gmail.com> (raw)
In-Reply-To: <20100308132043.f6dcc0cd.sfr@canb.auug.org.au>
On Mon, Mar 8, 2010 at 9:20 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Thanks for the notification and the fix. I am glad my trivial patch is
considered into the next level of code merge....
--
regards,
Mulyadi Santosa
Freelance Linux trainer and consultant
blog: the-hydra.blogspot.com
training: mulyaditraining.blogspot.com
next prev parent reply other threads:[~2010-03-08 2:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-08 2:20 linux-next: manual merge of the trivial tree with Linus' tree Stephen Rothwell
2010-03-08 2:41 ` Mulyadi Santosa [this message]
-- strict thread matches above, loose matches on Subject: below --
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=f284c33d1003071841n617191e6vade447b3413ee9f9@mail.gmail.com \
--to=mulyadi.santosa@gmail.com \
--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=sfr@canb.auug.org.au \
/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).