Messages in this thread | | | Date | Mon, 9 Sep 2013 15:22:19 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/dcache.c between commit db14fc3abcd5 ("vfs: add d_walk()") from Linus' tree and commit "shrinker: convert superblock shrinkers to new API" from the akpm tree.
I fixed it up (I just used the version of shrink_dcache_parent from Linus' tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |