[lkml]   [2010]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the fsnotify tree with the vfs tree
Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/inotify/inotify.c between commits
f3ffc7acb6a6ebec0a9e660d9211ed048d7e90f5 ("get rid of S_BIAS") and
73b38e074b51e5d8d2801691dff6e403631e927f ("Saner locking around
deactivate_super()") from the vfs tree and commit
b6bacae18f2f7722df9e8e516ed77b2815bd1ac7 ("inotify: remove inotify in
kernel interface") from the fsnotify tree.

The latter just removed the file, so I did that as well.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2010-05-18 07:13    [W:0.017 / U:50.700 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site