- partial 3.10 update

[packages/kernel.git] / ovl08-overlay-overlay-filesystem-documentation.patch

diff --git a/ovl07-overlay-overlay-filesystem-documentation.patch b/ovl08-overlay-overlay-filesystem-documentation.patch
similarity index 93%
rename from ovl07-overlay-overlay-filesystem-documentation.patch
rename to ovl08-overlay-overlay-filesystem-documentation.patch
index 4a1583241dc6ed89a5372faf3795cf44156cd831..6e66d75dc5cc599f9d8cb2ce0c9a1bfffc75bdf7 100644 (file)
--- a/ovl07-overlay-overlay-filesystem-documentation.patch
+++ b/ovl08-overlay-overlay-filesystem-documentation.patch
@@ -11,12 +11,9 @@ Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
  Documentation/filesystems/overlayfs.txt |  199 ++++++++++++++++++++++++++++++++
  MAINTAINERS                             |    7 +
  2 files changed, 206 insertions(+)
- create mode 100644 Documentation/filesystems/overlayfs.txt
 
-Index: linux-3.6-rc7-master/Documentation/filesystems/overlayfs.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6-rc7-master/Documentation/filesystems/overlayfs.txt       2012-09-28 13:36:58.000000000 +0200
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
 @@ -0,0 +1,199 @@
 +Written by: Neil Brown <neilb@suse.de>
 +
@@ -217,11 +214,9 @@ Index: linux-3.6-rc7-master/Documentation/filesystems/overlayfs.txt
 +filesystem are not allowed.  If the underlying filesystem is changed,
 +the behavior of the overlay is undefined, though it will not result in
 +a crash or deadlock.
-Index: linux-3.6-rc7-master/MAINTAINERS
-===================================================================
---- linux-3.6-rc7-master.orig/MAINTAINERS      2012-09-24 03:10:57.000000000 +0200
-+++ linux-3.6-rc7-master/MAINTAINERS   2012-09-28 13:36:58.000000000 +0200
-@@ -5104,6 +5104,13 @@ F:      drivers/scsi/osd/
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -6009,6 +6009,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/