linux-kernel - linux-next: manual merge of the cleancache tree with the vfs-scale 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]

Date:	Tue, 14 Dec 2010 16:55:21 +1100
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,
	Nick Piggin <npiggin@...nel.dk>
Subject: linux-next: manual merge of the cleancache tree with the vfs-scale
 tree

Hi Dan,

Today's linux-next merge of the cleancache tree got a conflict in
fs/super.c between commit fb0a35ccc864ca877ed0908abcb7e8d0a5e09858 ("fs:
dcache per-bucket dcache hash locking") from the vfs-scale tree and
commit 03e838947c8abe29a9d7abfaf7fd9125a46b70e9 ("mm/fs: add hooks to
support cleancache") from the cleancache tree.

Just trivial overlapping additions.  I fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/super.c
index 968ba01,30a54e0..0000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -30,7 -30,7 +30,8 @@@
  #include <linux/idr.h>
  #include <linux/mutex.h>
  #include <linux/backing-dev.h>
 +#include <linux/rculist_bl.h>
+ #include <linux/cleancache.h>
  #include "internal.h"
  
  
--
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/