Messages in this thread |  | | | Date | Tue, 9 Feb 2010 16:37:08 +1100 | | From | Stephen Rothwell <> | | Subject | linux-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/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose the new_name argument of fsnotify_move()") from the vfs tree and commit 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char * for dentry->d_name.name") from the fsnotify tree.
The former removed the code changed by the latter, so I used the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |