From 54e7f362a98160ee34796985431906f7d5bd3694 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Jan 2006 17:13:18 -0800 Subject: [PATCH] refresh with my signed-off-by for 2.6.14 queue --- ...-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch | 4 +--- .../ieee80211_crypt_tkip-depends-on-net_radio.patch | 10 +--------- queue-2.6.14/insanity-avoidance-in-proc.patch | 4 +--- ...on-t-overflow-the-user-supplied-buffer-with-0.patch | 4 +--- 4 files changed, 4 insertions(+), 18 deletions(-) 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 958f5cb73de..a2288e814f6 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 @@ -16,13 +16,11 @@ This patch was already included in 2.6.15-rc7. Signed-off-by: Adrian Bunk Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - 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 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 3b202c5e05b..59e0283b0c9 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 @@ -9,19 +9,11 @@ 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. - -Signed-off-by: Olaf Hering -Signed-off-by: Adrian Bunk -Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- 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 diff --git a/queue-2.6.14/insanity-avoidance-in-proc.patch b/queue-2.6.14/insanity-avoidance-in-proc.patch index a0d43071bad..62b728b69ee 100644 --- a/queue-2.6.14/insanity-avoidance-in-proc.patch +++ b/queue-2.6.14/insanity-avoidance-in-proc.patch @@ -20,13 +20,11 @@ insanely wrapping the offset or something. Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - fs/proc/generic.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) -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 _ 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 1e2f14be584..acab18cef3d 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 @@ -16,13 +16,11 @@ Noticed by Yi Yang Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - kernel/sysctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -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 -- 2.47.3