linux-next: build failure after merge of the akpm-current tree

[Stephen Rothwell]

Hi Andrew,

After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/notify/fanotify/fanotify_user.c: In function 'SYSC_fanotify_init':
fs/notify/fanotify/fanotify_user.c:707:8: error: 'struct fanotify_event_info' has no member named 'response'
  oevent->response = 0;
        ^

Caused by my bad conflict resolution.  I added the following merge fix
patch (but I am not too sure of it).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 26 Feb 2014 19:01:03 +1100
Subject: [PATCH] fanotify: fix for bad merge resolution

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/notify/fanotify/fanotify_user.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 0edc47f7dfae..0d378a8cd279 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -704,7 +704,6 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
 
 	group->fanotify_data.f_flags = event_f_flags;
 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
-	oevent->response = 0;
 	spin_lock_init(&group->fanotify_data.access_lock);
 	init_waitqueue_head(&group->fanotify_data.access_waitq);
 	INIT_LIST_HEAD(&group->fanotify_data.access_list);
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpeiQYA6pyI8.pgp
Description: PGP signature