Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
---- 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;
}
{
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,
#ifdef CONFIG_PM
.suspend = gem_suspend,
.resume = gem_resume,
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
Cc: Jeff Garzik <jgarzik@pobox.com>, Olaf Hering <olh@suse.de>
Subject: ieee80211_crypt_tkip depends on NET_RADIO
+From: Olaf Hering <olh@suse.de>
+
*** 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 <olh@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
-
---- a/net/ieee80211/Kconfig
-+++ b/net/ieee80211/Kconfig
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ 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
select CRYPTO
select CRYPTO_MICHAEL_MIC
---help---
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
insanely wrapping the offset or something.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
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;
}
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
-
Cc:
Subject: sysctl: don't overflow the user-supplied buffer with '0'
-tree 2e1aaa5e4e68057a4e96a606e2ad0bcccedcd6df
-parent 8b90db0df7187a01fb7177f1f812123138f562cf
-author Linus Torvalds <torvalds@g5.osdl.org> Sat, 31 Dec 2005 09:18:53 -0800
-committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 31 Dec 2005 09:18:53 -0800
-
-sysctl: don't overflow the user-supplied buffer with '0'
+From: Linus Torvalds <torvalds@g5.osdl.org>
If the string was too long to fit in the user-supplied buffer,
the sysctl layer would zero-terminate it by writing past the
Noticed by Yi Yang <yang.y.yi@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
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) {
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
-