Jonathan Nieder wrote:
> Greg KH wrote:
>
> > It doesn't apply to 3.0-stable, so if you want to see it there, can you
> > please provide a backported version?
>
> There are semantically uninteresting conflicts with v3.1-rc1~133^2~42
> ("TOMOYO: Cleanup part 2"). Here's a blind backport (untested).
Jonathan, thank you for updating the patch.
Yes, as diff shown below, you updated the patch correctly.
@@ -200 +206 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_REMOUNT];
+ type = TOMOYO_MOUNT_REMOUNT_KEYWORD;
@@ -203 +209 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_BIND];
+ type = TOMOYO_MOUNT_BIND_KEYWORD;
@@ -208 +214 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SHARED];
+ type = TOMOYO_MOUNT_MAKE_SHARED_KEYWORD;
@@ -213 +219 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_PRIVATE];
+ type = TOMOYO_MOUNT_MAKE_PRIVATE_KEYWORD;
@@ -218 +224 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SLAVE];
+ type = TOMOYO_MOUNT_MAKE_SLAVE_KEYWORD;
@@ -223 +229 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_UNBINDABLE];
+ type = TOMOYO_MOUNT_MAKE_UNBINDABLE_KEYWORD;
@@ -226 +232 @@
- type = tomoyo_mounts[TOMOYO_MOUNT_MOVE];
+ type = TOMOYO_MOUNT_MOVE_KEYWORD;
You can add "Acked-by: Tetsuo Handa <[email protected]>" or
"Tested-by: Tetsuo Handa <[email protected]>" if needed.
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
