aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-02-23 10:59:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-02-23 10:59:40 +0000
commitf677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb (patch)
treea4971798ff33bb5e653297f14906628b84407790 /target/linux/generic/patches-3.10
parent6c8300df3d593abd911a3d6bb1a95eee4cfd06f8 (diff)
downloadupstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.gz
upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.bz2
upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.zip
kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 39707
Diffstat (limited to 'target/linux/generic/patches-3.10')
-rw-r--r--target/linux/generic/patches-3.10/060-hso_devices.patch2
-rw-r--r--target/linux/generic/patches-3.10/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch4
-rw-r--r--target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch2
-rw-r--r--target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch4
-rw-r--r--target/linux/generic/patches-3.10/721-phy_packets.patch2
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.10/060-hso_devices.patch b/target/linux/generic/patches-3.10/060-hso_devices.patch
index fd7cab7550..6196345f6c 100644
--- a/target/linux/generic/patches-3.10/060-hso_devices.patch
+++ b/target/linux/generic/patches-3.10/060-hso_devices.patch
@@ -15,7 +15,7 @@
{USB_DEVICE(0x0af0, 0xd155)},
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
-@@ -1259,6 +1259,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1266,6 +1266,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ),
diff --git a/target/linux/generic/patches-3.10/100-overlayfs.patch b/target/linux/generic/patches-3.10/100-overlayfs.patch
index f8c8aacbcc..02894b34f2 100644
--- a/target/linux/generic/patches-3.10/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.10/100-overlayfs.patch
@@ -3149,7 +3149,7 @@
+module_exit(ovl_exit);
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1313,6 +1313,7 @@ long do_splice_direct(struct file *in, l
+@@ -1331,6 +1331,7 @@ long do_splice_direct(struct file *in, l
return ret;
}
diff --git a/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
index 69b11cb60c..85b592feae 100644
--- a/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
@@ -61,10 +61,10 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
retval = ehci_setup(hcd);
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
-@@ -200,6 +200,7 @@ struct ehci_hcd { /* one per controlle
- unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
+@@ -201,6 +201,7 @@ struct ehci_hcd { /* one per controlle
unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
unsigned need_oc_pp_cycle:1; /* MPC834X port power */
+ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */
+ unsigned ignore_oc:1;
/* required for usb32 quirk */
diff --git a/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch b/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
index 96af411e8d..6385f0151e 100644
--- a/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
@@ -1081,7 +1081,7 @@
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
-@@ -77,6 +87,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
+@@ -78,6 +88,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
diff --git a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 978b246607..ddd3f747c6 100644
--- a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -69,7 +69,7 @@
static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
-@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r
+@@ -184,6 +184,7 @@ static int ipmr_rule_action(struct fib_r
case FR_ACT_UNREACHABLE:
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
@@ -91,7 +91,7 @@
table = fib6_get_table(net, rule->table);
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
-@@ -166,6 +166,8 @@ static int ip6mr_rule_action(struct fib_
+@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
return -EACCES;
diff --git a/target/linux/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch
index 02a3b5b2df..e21e272183 100644
--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/721-phy_packets.patch
@@ -135,7 +135,7 @@
#include <net/protocol.h>
#include <net/dst.h>
-@@ -471,6 +472,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc
}
EXPORT_SYMBOL(__netdev_alloc_skb);