linux-next: manual merge of the akpm tree with Linus' tree
From: Stephen Rothwell
Date: Wed Dec 28 2011 - 02:55:15 EST
Today's linux-next merge of the akpm tree got a conflict in
include/linux/lglock.h between commit e30e2fdfe562 ("VFS: Fix race
between CPU hotplug and lglocks") from Linus' tree and commit
"brlocks/lglocks: clean up code" from the akpm tree.
Given the extent of the conflict and that this patch also conflicts in
several other files (fs/dcache.c, fs/file_table.c, fs/namei.c,
fs/namespace.c - presumably against the vfs tree), I have dropped this
patch (and the following
"brlocks-lglocks-clean-up-code-checkpatch-fixes") from the akpm tree.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature