From: Chris Wright Date: Thu, 5 Jan 2006 01:00:18 +0000 (-0800) Subject: Add Signed-off-by and refresh 2.6.14 patches X-Git-Tag: v2.6.14.6~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=faaa4b368b929db54df7a992239d01ccb60c9054;p=thirdparty%2Fkernel%2Fstable-queue.git Add Signed-off-by and refresh 2.6.14 patches --- diff --git a/queue-2.6.14/drivers-net-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch b/queue-2.6.14/drivers-net-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch index 634003f4c8b..958f5cb73de 100644 --- a/queue-2.6.14/drivers-net-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch +++ b/queue-2.6.14/drivers-net-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch @@ -15,10 +15,17 @@ This patch was already included in 2.6.15-rc7. Signed-off-by: Adrian Bunk +Signed-off-by: Chris Wright +--- ---- linux-2.6.15-rc6/drivers/net/sungem.c.old 2005-12-21 14:02:51.000000000 +0100 -+++ linux-2.6.15-rc6/drivers/net/sungem.c 2005-12-21 14:03:37.000000000 +0100 -@@ -2907,7 +2907,7 @@ + drivers/net/sungem.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6.14.5/drivers/net/sungem.c +=================================================================== +--- linux-2.6.14.5.orig/drivers/net/sungem.c ++++ linux-2.6.14.5/drivers/net/sungem.c +@@ -2905,7 +2905,7 @@ static int __devinit gem_get_device_addr return 0; } @@ -27,7 +34,7 @@ Signed-off-by: Adrian Bunk { struct net_device *dev = pci_get_drvdata(pdev); -@@ -3181,7 +3181,7 @@ +@@ -3179,7 +3179,7 @@ static struct pci_driver gem_driver = { .name = GEM_MODULE_NAME, .id_table = gem_pci_tbl, .probe = gem_init_one, @@ -36,9 +43,3 @@ Signed-off-by: Adrian Bunk #ifdef CONFIG_PM .suspend = gem_suspend, .resume = gem_resume, - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue-2.6.14/ieee80211_crypt_tkip-depends-on-net_radio.patch b/queue-2.6.14/ieee80211_crypt_tkip-depends-on-net_radio.patch index f77160eaf4b..3b202c5e05b 100644 --- a/queue-2.6.14/ieee80211_crypt_tkip-depends-on-net_radio.patch +++ b/queue-2.6.14/ieee80211_crypt_tkip-depends-on-net_radio.patch @@ -7,18 +7,23 @@ Content-Disposition: inline Cc: Jeff Garzik , Olaf Hering Subject: ieee80211_crypt_tkip depends on NET_RADIO +From: Olaf Hering + *** Warning: ".wireless_send_event" [net/ieee80211/ieee80211_crypt_tkip.ko] This bug was also reported as kerenl Bugzilla #5551. -This patch was already included in Linus' tree. - - Signed-off-by: Olaf Hering Signed-off-by: Adrian Bunk - ---- a/net/ieee80211/Kconfig -+++ b/net/ieee80211/Kconfig +Signed-off-by: Chris Wright +--- + net/ieee80211/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: linux-2.6.14.5/net/ieee80211/Kconfig +=================================================================== +--- linux-2.6.14.5.orig/net/ieee80211/Kconfig ++++ linux-2.6.14.5/net/ieee80211/Kconfig @@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP @@ -28,9 +33,3 @@ Signed-off-by: Adrian Bunk select CRYPTO select CRYPTO_MICHAEL_MIC ---help--- - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue-2.6.14/insanity-avoidance-in-proc.patch b/queue-2.6.14/insanity-avoidance-in-proc.patch index 56192b57c38..a0d43071bad 100644 --- a/queue-2.6.14/insanity-avoidance-in-proc.patch +++ b/queue-2.6.14/insanity-avoidance-in-proc.patch @@ -19,14 +19,16 @@ But at least we can make the non-LFS rules explicit, rather than just insanely wrapping the offset or something. Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +--- fs/proc/generic.c | 47 +++++++++++++++++++++++------------------------ - 1 files changed, 23 insertions(+), 24 deletions(-) + 1 file changed, 23 insertions(+), 24 deletions(-) -diff --git a/fs/proc/generic.c b/fs/proc/generic.c -index b638fb5..72b431d 100644 ---- a/fs/proc/generic.c -+++ b/fs/proc/generic.c +Index: linux-2.6.14.5/fs/proc/generic.c +=================================================================== +--- linux-2.6.14.5.orig/fs/proc/generic.c ++++ linux-2.6.14.5/fs/proc/generic.c @@ -54,6 +54,18 @@ proc_file_read(struct file *file, char _ ssize_t n, count; char *start; @@ -88,13 +90,3 @@ index b638fb5..72b431d 100644 } static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) -- -To unsubscribe from this list: send the line "unsubscribe git-commits-head" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue-2.6.14/sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch b/queue-2.6.14/sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch index a5c9788aecb..1e2f14be584 100644 --- a/queue-2.6.14/sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch +++ b/queue-2.6.14/sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch @@ -6,12 +6,7 @@ To: git-commits-head@vger.kernel.org Cc: Subject: sysctl: don't overflow the user-supplied buffer with '0' -tree 2e1aaa5e4e68057a4e96a606e2ad0bcccedcd6df -parent 8b90db0df7187a01fb7177f1f812123138f562cf -author Linus Torvalds Sat, 31 Dec 2005 09:18:53 -0800 -committer Linus Torvalds Sat, 31 Dec 2005 09:18:53 -0800 - -sysctl: don't overflow the user-supplied buffer with '0' +From: Linus Torvalds If the string was too long to fit in the user-supplied buffer, the sysctl layer would zero-terminate it by writing past the @@ -20,15 +15,17 @@ end of the buffer. Don't do that. Noticed by Yi Yang Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +--- kernel/sysctl.c | 4 +--- - 1 files changed, 1 insertion(+), 3 deletions(-) + 1 file changed, 1 insertion(+), 3 deletions(-) -diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 9990e10..ad0425a 100644 ---- a/kernel/sysctl.c -+++ b/kernel/sysctl.c -@@ -2201,14 +2201,12 @@ int sysctl_string(ctl_table *table, int +Index: linux-2.6.14.5/kernel/sysctl.c +=================================================================== +--- linux-2.6.14.5.orig/kernel/sysctl.c ++++ linux-2.6.14.5/kernel/sysctl.c +@@ -2200,14 +2200,12 @@ int sysctl_string(ctl_table *table, int if (get_user(len, oldlenp)) return -EFAULT; if (len) { @@ -44,13 +41,3 @@ index 9990e10..ad0425a 100644 if(put_user(len, oldlenp)) return -EFAULT; } -- -To unsubscribe from this list: send the line "unsubscribe git-commits-head" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable -