sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt/staging/mkresin.git] / target / linux / generic / patches-3.0 / 100-overlayfs_v10.patch

diff --git a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
index 32a628f8b2e590bf85af13bbdd7afcdd1279f2f1..4810713889634319fcf6fcda70481e33356bd32e 100644 (file)
--- a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
+++ b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
@@ -156,7 +156,7 @@
  {
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1602,6 +1602,7 @@ struct inode_operations {
+@@ -1603,6 +1603,7 @@ struct inode_operations {
        void (*truncate_range)(struct inode *, loff_t, loff_t);
        int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
                      u64 len);
@@ -164,7 +164,7 @@
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -1996,6 +1997,7 @@ extern long do_sys_open(int dfd, const c
+@@ -1997,6 +1998,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, int);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
                                   const char *, int);
@@ -3057,7 +3057,7 @@
 +the future.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4713,6 +4713,13 @@ F:      drivers/scsi/osd/
+@@ -4717,6 +4717,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/