linux-kernel - Re: linux-next: manual merge of the trivial tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 8 Mar 2010 09:41:53 +0700
From:	Mulyadi Santosa <mulyadi.santosa@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jiri Kosina <jkosina@...e.cz>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the trivial tree with Linus' tree

On Mon, Mar 8, 2010 at 9:20 AM, Stephen Rothwell <sfr@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/