From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 1 Feb 2013 17:30:15 +0000 (+0000)
Subject: linux/3.6: refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fb936218a13b6f05d8e15b494fe12ad1503a1189;p=openwrt%2Fstaging%2Fstintel.git

linux/3.6: refresh patches

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35440
---

diff --git a/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
index ddc27b104e..6ec137ff74 100644
--- a/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
+++ b/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -651,6 +651,10 @@
+@@ -642,6 +642,10 @@ static const struct spi_device_id m25p_i
  	/* Everspin */
-	{ "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
+ 	{ "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
  
 +	/* GigaDevice */
 +	{ "gd25q32", INFO(0xc84016, 0, 64 * 1024,  64, SECT_4K) },
diff --git a/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
index 76989506aa..3265e8e9d1 100644
--- a/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-3.6/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -16,7 +16,7 @@
  };
  
  #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)	\
-@@ -659,6 +661,10 @@ static const struct spi_device_id m25p_i
+@@ -663,6 +665,10 @@ static const struct spi_device_id m25p_i
  	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
  	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
  
@@ -27,7 +27,7 @@
  	/* Spansion -- single (large) sector size only, at least
  	 * for the chips listed here (without boot sectors).
  	 */
-@@ -895,6 +901,9 @@ static int __devinit m25p_probe(struct s
+@@ -899,6 +905,9 @@ static int __devinit m25p_probe(struct s
  	if (info->flags & SECT_4K) {
  		flash->erase_opcode = OPCODE_BE_4K;
  		flash->mtd.erasesize = 4096;
diff --git a/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch b/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
index d731d1279a..7d38a1023d 100644
--- a/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
+++ b/target/linux/generic/patches-3.6/473-mtd_m25p80_add_w25q128.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -739,6 +739,7 @@ static const struct spi_device_id m25p_i
+@@ -743,6 +743,7 @@ static const struct spi_device_id m25p_i
  	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
  	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
  	{ "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
diff --git a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
index 270586ea74..6aacaaca93 100644
--- a/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
+++ b/target/linux/generic/patches-3.6/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -30,7 +30,7 @@
  /****************************************************************************/
  
  struct m25p {
-@@ -899,7 +905,7 @@ static int __devinit m25p_probe(struct s
+@@ -903,7 +909,7 @@ static int __devinit m25p_probe(struct s
  		flash->mtd._write = m25p80_write;
  
  	/* prefer "small sector" erase if possible */
diff --git a/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch
index cbcd29ac39..3ee5e49829 100644
--- a/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, 
+@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode,
  			sizeof(struct ct_iter_state));
  }
  
diff --git a/target/linux/generic/patches-3.6/950-vm_exports.patch b/target/linux/generic/patches-3.6/950-vm_exports.patch
index a49a2f7791..ba363c11bd 100644
--- a/target/linux/generic/patches-3.6/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.6/950-vm_exports.patch
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2920,6 +2920,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2914,6 +2914,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
  
  /* 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
-@@ -2997,11 +3007,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2991,11 +3001,8 @@ int shmem_zero_setup(struct vm_area_stru
  	if (IS_ERR(file))
  		return PTR_ERR(file);