linux-kernel - linux-next: manual merge of the tmem tree with the trivial 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>] [day] [month] [year] [list]

Message-Id: <20110922180659.1b4c2c4c17d0e2fb4f871444@canb.auug.org.au>
Date:	Thu, 22 Sep 2011 18:06:59 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Magenheimer <dan.magenheimer@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Bolle <pebolle@...cali.nl>, Jiri Kosina <jkosina@...e.cz>
Subject: linux-next: manual merge of the tmem tree with the trivial tree

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
mm/cleancache.c between commit c460578a674f ("Documentation: fix broken
references") from the  tree and commit c3adff5aa194 ("mm: cleancache:
report statistics via debugfs instead of sysfs") from the tmem tree.

The latter removed the comment that the former was correcting.  So I sued
the letter version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped