aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-25 14:38:57 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-25 14:38:57 +0000
commit832890dc2f977f20e0fd4028340f45ad40d989b5 (patch)
tree8132c7d526e42dd486efdd7d701a17b40d206036
parentf699e866071e7938960d75c1d1823d1c370d5a01 (diff)
downloadupstream-832890dc2f977f20e0fd4028340f45ad40d989b5.tar.gz
upstream-832890dc2f977f20e0fd4028340f45ad40d989b5.tar.bz2
upstream-832890dc2f977f20e0fd4028340f45ad40d989b5.zip
kernel/3.10: add upstream commit id to the backported hso patches
Also remove the internal patch numbers. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38179 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch4
-rw-r--r--target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch4
2 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch b/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
index 4eb31b31aa..04866edbcd 100644
--- a/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
+++ b/target/linux/generic/patches-3.10/007-hso-Earlier-catch-of-error-condition.patch
@@ -1,7 +1,9 @@
From 35e57e1b49a351aa804dab6010cd46ae6112a541 Mon Sep 17 00:00:00 2001
From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Wed, 21 Aug 2013 01:43:07 -0700
-Subject: [PATCH 1/2] hso: Earlier catch of error condition
+Subject: [PATCH] hso: Earlier catch of error condition
+
+commit 35e57e1b49a351aa804dab6010cd46ae6112a541 upstream.
There is no need to get an interface specification if we know it's the
wrong one.
diff --git a/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch b/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch
index 067e7f85ba..e44f713d63 100644
--- a/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch
+++ b/target/linux/generic/patches-3.10/008-hso-Fix-stack-corruption-on-some-architectures.patch
@@ -1,7 +1,9 @@
From e75dc677ff8d06ffa61bef6fee436227ae5440c6 Mon Sep 17 00:00:00 2001
From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Wed, 21 Aug 2013 01:43:19 -0700
-Subject: [PATCH 2/2] hso: Fix stack corruption on some architectures
+Subject: [PATCH] hso: Fix stack corruption on some architectures
+
+commit e75dc677ff8d06ffa61bef6fee436227ae5440c6 upstream.
As Sergei Shtylyov explained in the #mipslinux IRC channel:
[Mon 2013-08-19 12:28:21 PM PDT] <headless> guys, are you sure it's not "DMA off stack" case?