Subject: linux-next: manual merge of the bkl-trivial tree with the hfsplus tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Oct 2010 10:47:40 +1100

Hi Arnd,

Today's linux-next merge of the bkl-trivial tree got a conflict in
fs/hfsplus/ioctl.c between commits
94744567fef9602c3d8218a1d8f58c04cce354f6 ("hfsplus: split hfsplus_ioctl")
and 6333816ade7e04a96ec0a34a8378c455e4f7c4dd ("hfsplus: protect setflags
using i_mutex") from the hfsplus tree and commit
65c7297b0322453d238b2d23918a3a8b3a223c3b ("drivers: autoconvert trivial
BKL users to private mutex") from the bkl-trivial tree.

The second of the hfsplus tree commits seems to supercede the bkl-trivial
one, so I used that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/