Prev: tracing: Move fields from event to class structure
Next: [PATCH] fix a code style in drivers/char/virtio_console.c
From: Stephen Rothwell on 18 May 2010 01:20
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.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
 | 
Pages: 1
Prev: tracing: Move fields from event to class structure
Next: [PATCH] fix a code style in drivers/char/virtio_console.c