Fix GigaDevice GD25Q32/GD25Q64 SPI Flash bad commit. The patch was added to "linux/generic/patches-3.6" instead of "target/linux/generic/patches-3.6". I also fixed a missing patch space and refreshed generic patches.
Signed-off-by: Álvaro Fernández Rojas <[email protected]> --- diff --git a/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch b/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch deleted file mode 100644 index ddc27b1..0000000 --- a/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -651,6 +651,10 @@ - /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) }, - -+ /* GigaDevice */ -+ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) }, -+ { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) }, -+ - /* Intel/Numonyx -- xxxs33b */ - { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, - { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, diff --git a/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch new file mode 100644 index 0000000..592a193 --- /dev/null +++ b/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch @@ -0,0 +1,13 @@ +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -651,6 +651,10 @@ static const struct spi_device_id m25p_i + /* Everspin */ + { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) }, + ++ /* GigaDevice */ ++ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) }, ++ { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) }, ++ + /* Intel/Numonyx -- xxxs33b */ + { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, + { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, 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 cbcd29a..3ee5e49 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)); } _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
