From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754064AbcITG0f (ORCPT ); Tue, 20 Sep 2016 02:26:35 -0400 Received: from ozlabs.org ([103.22.144.67]:35980 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075AbcITG0e (ORCPT ); Tue, 20 Sep 2016 02:26:34 -0400 Date: Tue, 20 Sep 2016 16:26:30 +1000 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20160920162630.0724a982@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, After merging the akpm-current tree, today's linux-next build (arm multi_v7_defconfig) failed like this: fs/notify/notification.c: In function 'fsnotify_add_event': fs/notify/notification.c:116:22: error: 'struct fsnotify_group' has no member named 'notification_mutex' mutex_unlock(&group->notification_mutex); ^ Caused by a bad git merge automatic resolution. I had to apply the following merge fix patch: From: Stephen Rothwell Date: Tue, 20 Sep 2016 16:23:48 +1000 Subject: [PATCH] fix bad merge of fs/notify/notification.c Signed-off-by: Stephen Rothwell --- fs/notify/notification.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/notify/notification.c b/fs/notify/notification.c index ac14fa4d266b..1a8010e7a2a0 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c @@ -112,11 +112,6 @@ int fsnotify_add_event(struct fsnotify_group *group, return 2; } - if (group->shutdown) { - mutex_unlock(&group->notification_mutex); - return 2; - } - if (group->q_len >= group->max_events) { ret = 2; /* Queue overflow event only if it isn't already queued */ -- 2.8.1 -- Cheers, Stephen Rothwell