From 6d4bb75f74053589d8c7130ab535a17435cb0c57 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Dec 2005 15:52:12 -0800 Subject: [PATCH] some minor comment edits of the patches before they are applied --- review/add-try_to_freeze-to-kauditd.patch | 2 -- review/bonding-fix-feature-consolidation.patch | 2 -- review/cciss-bug-fix-for-big_pass_thru.patch | 2 -- review/cciss-bug-fix-for-hpacucli.patch | 2 -- review/fix-processing-of-fib_lookup-netlink-messages.patch | 2 +- review/fix-serverworks-tlb-flush..patch | 4 +--- ...-floppy-software-eject-not-working-with-ls-120-drive.patch | 2 -- review/locking-rewrite.patch | 2 +- review/nm256-reset-workaround-for-latitude-csx.patch | 4 +--- review/recompute-features-when-adding-a-new-device.patch | 2 +- review/setkeys-needs-root.patch | 2 +- 11 files changed, 6 insertions(+), 20 deletions(-) diff --git a/review/add-try_to_freeze-to-kauditd.patch b/review/add-try_to_freeze-to-kauditd.patch index b25281fe894..b43110ae301 100644 --- a/review/add-try_to_freeze-to-kauditd.patch +++ b/review/add-try_to_freeze-to-kauditd.patch @@ -18,8 +18,6 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman -diff --git a/kernel/audit.c b/kernel/audit.c -index 0c56320..32fa03a 100644 --- kernel/audit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/review/bonding-fix-feature-consolidation.patch b/review/bonding-fix-feature-consolidation.patch index 9f5c35dd62e..6b8e2dd9e1d 100644 --- a/review/bonding-fix-feature-consolidation.patch +++ b/review/bonding-fix-feature-consolidation.patch @@ -21,8 +21,6 @@ Signed-off-by: Jay Vosburgh Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman -diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 8032126..94cec3c 100644 --- drivers/net/bonding/bond_main.c | 32 +++++++++++--------------------- drivers/net/bonding/bonding.h | 7 ++----- diff --git a/review/cciss-bug-fix-for-big_pass_thru.patch b/review/cciss-bug-fix-for-big_pass_thru.patch index 329a1cb09b2..4309a660269 100644 --- a/review/cciss-bug-fix-for-big_pass_thru.patch +++ b/review/cciss-bug-fix-for-big_pass_thru.patch @@ -16,8 +16,6 @@ Signed-off-by: Mike Miller Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman -diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c -index e239a6c..33f8341 100644 --- drivers/block/cciss.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/review/cciss-bug-fix-for-hpacucli.patch b/review/cciss-bug-fix-for-hpacucli.patch index f5ef6a373cc..9c928853ab9 100644 --- a/review/cciss-bug-fix-for-hpacucli.patch +++ b/review/cciss-bug-fix-for-hpacucli.patch @@ -20,8 +20,6 @@ Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman -diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h -index 424d5e6..6e27f42 100644 --- include/linux/cciss_ioctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review/fix-processing-of-fib_lookup-netlink-messages.patch b/review/fix-processing-of-fib_lookup-netlink-messages.patch index 20c8bdc9d7d..c668756b4d3 100644 --- a/review/fix-processing-of-fib_lookup-netlink-messages.patch +++ b/review/fix-processing-of-fib_lookup-netlink-messages.patch @@ -4,7 +4,7 @@ From: Thomas Graf To: "David S. Miller" Message-ID: <20051201220512.GT20395@postel.suug.ch> Cc: Robert Olsson , stable@kernel.org, netdev@vger.kernel.org -Subject: [PATCH] [NETLINK]: Fix processing of fib_lookup netlink messages +Subject: NETLINK: Fix processing of fib_lookup netlink messages The receive path for fib_lookup netlink messages is lacking sanity checks for header and payload and is thus vulnerable to malformed diff --git a/review/fix-serverworks-tlb-flush..patch b/review/fix-serverworks-tlb-flush..patch index 514b258b507..ed9fc8e9d5b 100644 --- a/review/fix-serverworks-tlb-flush..patch +++ b/review/fix-serverworks-tlb-flush..patch @@ -4,7 +4,7 @@ Message-Id: <200511072202.jA7M2wXl001471@hera.kernel.org> From: Linux Kernel Mailing List To: git-commits-head@vger.kernel.org Cc: -Subject: [stable] [AGPGART] Fix serverworks TLB flush. +Subject: AGPGART: Fix serverworks TLB flush. From: Dave Jones @@ -19,8 +19,6 @@ Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman -diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c -index a9fb12c..5396897 100644 --- drivers/char/agp/sworks-agp.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/review/ide-floppy-software-eject-not-working-with-ls-120-drive.patch b/review/ide-floppy-software-eject-not-working-with-ls-120-drive.patch index efc38eb95dc..a711772a55b 100644 --- a/review/ide-floppy-software-eject-not-working-with-ls-120-drive.patch +++ b/review/ide-floppy-software-eject-not-working-with-ls-120-drive.patch @@ -21,8 +21,6 @@ Signed-off-by: Ondrej Zary Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman -diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c -index e83f54d..f615ab7 100644 --- drivers/ide/ide-floppy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/review/locking-rewrite.patch b/review/locking-rewrite.patch index 8cb95638fa8..32753cf67dd 100644 --- a/review/locking-rewrite.patch +++ b/review/locking-rewrite.patch @@ -4,7 +4,7 @@ Message-Id: <200510311705.j9VH5aDM031690@hera.kernel.org> From: Linux Kernel Mailing List To: git-commits-head@vger.kernel.org Cc: -Subject: [libata] locking rewrite (== fix) +Subject: libata: locking rewrite (== fix) From: Jeff Garzik diff --git a/review/nm256-reset-workaround-for-latitude-csx.patch b/review/nm256-reset-workaround-for-latitude-csx.patch index 2dadacef67c..138a3a60c48 100644 --- a/review/nm256-reset-workaround-for-latitude-csx.patch +++ b/review/nm256-reset-workaround-for-latitude-csx.patch @@ -5,7 +5,7 @@ To: stable@kernel.org Message-ID: <20051207025153.GA22374@redhat.com> Content-Disposition: inline Cc: -Subject: [ALSA] nm256: reset workaround for Latitude CSx +Subject: ALSA: nm256: reset workaround for Latitude CSx From: John W. Linville @@ -27,8 +27,6 @@ Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman -diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c -index ebfa38b..d0da9a5 100644 --- sound/pci/nm256/nm256.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/review/recompute-features-when-adding-a-new-device.patch b/review/recompute-features-when-adding-a-new-device.patch index e7768c0ad81..b11d2589e04 100644 --- a/review/recompute-features-when-adding-a-new-device.patch +++ b/review/recompute-features-when-adding-a-new-device.patch @@ -4,7 +4,7 @@ Message-Id: <200511240800.jAO803jw027240@hera.kernel.org> From: Linux Kernel Mailing List To: git-commits-head@vger.kernel.org Cc: -Subject: [BRIDGE]: recompute features when adding a new device +Subject: BRIDGE: recompute features when adding a new device From: Olaf Rempel diff --git a/review/setkeys-needs-root.patch b/review/setkeys-needs-root.patch index c6c3bde2a6b..a7617c65f7a 100644 --- a/review/setkeys-needs-root.patch +++ b/review/setkeys-needs-root.patch @@ -4,7 +4,7 @@ Date: Fri, 02 Dec 2005 20:56:21 +0000 From: Daniel Drake To: stable@kernel.org Cc: marcelo.tosatti@cyclades.com, mikpe@csd.uu.se -Subject: [PATCH] setkeys needs root +Subject: setkeys needs root This patch combines commit 0b360adbdb54d5b98b78d57ba0916bc4b8871968 (make setkeys root-only) and commit e3f17f0f6e98f58edb13cb38810d93e6d4808e68 (only -- 2.47.3