From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 28 Jun 2011 20:25:39 +0000 (+0000)
Subject: kernel: refresh patches for kernel 3.0-rc5
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3f0eed15a2c8140943f66e31806054c7550377ae;p=openwrt%2Fstaging%2Frmilecki.git

kernel: refresh patches for kernel 3.0-rc5

SVN-Revision: 27300
---

diff --git a/target/linux/brcm47xx/patches-3.0/830-tg3_add_pci_ids.patch b/target/linux/brcm47xx/patches-3.0/830-tg3_add_pci_ids.patch
index 1fbd909d085..faa9380fada 100644
--- a/target/linux/brcm47xx/patches-3.0/830-tg3_add_pci_ids.patch
+++ b/target/linux/brcm47xx/patches-3.0/830-tg3_add_pci_ids.patch
@@ -23,7 +23,7 @@ Date:   Thu Dec 16 20:01:17 2010 +0100
  	{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -2076,6 +2076,7 @@
+@@ -2077,6 +2077,7 @@
  #define PCI_DEVICE_ID_NX2_57711E	0x1650
  #define PCI_DEVICE_ID_TIGON3_5705	0x1653
  #define PCI_DEVICE_ID_TIGON3_5705_2	0x1654
@@ -31,7 +31,7 @@ Date:   Thu Dec 16 20:01:17 2010 +0100
  #define PCI_DEVICE_ID_TIGON3_5721	0x1659
  #define PCI_DEVICE_ID_TIGON3_5722	0x165a
  #define PCI_DEVICE_ID_TIGON3_5723	0x165b
-@@ -2091,11 +2092,13 @@
+@@ -2092,11 +2093,13 @@
  #define PCI_DEVICE_ID_TIGON3_5754M	0x1672
  #define PCI_DEVICE_ID_TIGON3_5755M	0x1673
  #define PCI_DEVICE_ID_TIGON3_5756	0x1674
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 fd6aae32a8f..48107138896 100644
--- 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);
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index 4693c53f9b3..0ba09166c09 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2944,6 +2944,16 @@ out:
+@@ -2951,6 +2951,16 @@ out:
  
  /* common code */
  
@@ -17,7 +17,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -3021,10 +3031,7 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -3028,11 +3038,8 @@ int shmem_zero_setup(struct vm_area_stru
  	if (IS_ERR(file))
  		return PTR_ERR(file);
  
@@ -30,6 +30,7 @@
 +
  	return 0;
  }
+ 
 --- a/fs/file.c
 +++ b/fs/file.c
 @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
@@ -78,8 +79,8 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
-@@ -2821,6 +2822,7 @@ int vmtruncate_range(struct inode *inode
- 
+@@ -3014,6 +3015,7 @@ static inline int check_stack_guard_page
+ 	}
  	return 0;
  }
 +EXPORT_SYMBOL_GPL(vmtruncate_range);
diff --git a/target/linux/generic/patches-3.0/999-drop_sublevel.patch b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
index e2fde683a7c..9c5279e6923 100644
--- a/target/linux/generic/patches-3.0/999-drop_sublevel.patch
+++ b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
@@ -4,6 +4,6 @@
  VERSION = 3
  PATCHLEVEL = 0
 -SUBLEVEL = 0
- EXTRAVERSION = -rc4
+ EXTRAVERSION = -rc5
  NAME = Sneaky Weasel