Subject: [folded-merged] ocfs2-add-dlm_recover_callback_support-in-sysfs-fix-2.patch removed from -mm tree
To: sfr@xxxxxxxxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,rgoldwyn@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 03 Apr 2014 14:02:51 -0700
The patch titled
Subject: ocfs2: VERIFY_OCTAL_PERMISSIONS fix up
has been removed from the -mm tree. Its filename was
ocfs2-add-dlm_recover_callback_support-in-sysfs-fix-2.patch
This patch was dropped because it was folded into ocfs2-add-dlm_recover_callback_support-in-sysfs.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: ocfs2: VERIFY_OCTAL_PERMISSIONS fix up
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/stackglue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/ocfs2/stackglue.c~ocfs2-add-dlm_recover_callback_support-in-sysfs-fix-2 fs/ocfs2/stackglue.c
--- a/fs/ocfs2/stackglue.c~ocfs2-add-dlm_recover_callback_support-in-sysfs-fix-2
+++ a/fs/ocfs2/stackglue.c
@@ -611,7 +611,7 @@ static ssize_t ocfs2_dlm_recover_show(st
}
static struct kobj_attribute ocfs2_attr_dlm_recover_support =
- __ATTR(dlm_recover_callback_support, S_IFREG | S_IRUGO,
+ __ATTR(dlm_recover_callback_support, S_IRUGO,
ocfs2_dlm_recover_show, NULL);
static struct attribute *ocfs2_attrs[] = {
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
ocfs2-add-dlm_recover_callback_support-in-sysfs.patch
mm-process_vm_accessc-mark-function-as-static-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
