Re: linux-next: manual merge of the akpm-current tree with the ext3 tree

Hi Stephen! On Tue 27-02-18 14:11:53, Stephen Rothwell wrote: > Today's linux-next merge of the akpm-current tree got conflicts in: > > fs/notify/fanotify/fanotify.c > fs/notify/fanotify/fanotify.h > fs/notify/fanotify/fanotify_user.c > fs/notify/inotify/inotify_fsnotify.c > > between co

linux-next: manual merge of the akpm-current tree with the ext3 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: fs/notify/fanotify/fanotify.c fs/notify/fanotify/fanotify.h fs/notify/fanotify/fanotify_user.c fs/notify/inotify/inotify_fsnotify.c between commits: 1e301852d657 ("fanotify: Avoid lost events due to ENOMEM

linux-next: manual merge of the akpm-current tree with the ext3 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/ocfs2/inode.h between commit 1c92ec678f32 ("ocfs2: Convert to private i_dquot field") from the ext3 tree and commit eeb85794b87e ("ocfs2: fix leftover orphan entry caused by append O_DIRECT write crash") from the akp

linux-next: manual merge of the akpm-current tree with the ext3 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in fs/notify/fanotify/fanotify_user.c between commit ff57cd5863cf ("fsnotify: Allocate overflow events with proper type") from the ext3 tree and commit c40e3490382b ("fanotify: convert access_mutex to spinlock") from the a