From daec37811a31579ad6c38bcf68fe891256d0d714 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Jun 2011 16:53:19 +0900 Subject: [PATCH] fix up some email addresses --- .../drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch | 6 +++--- queue-2.6.38/mtd-return-badblockbits-back.patch | 6 +++--- queue-2.6.38/series | 1 + .../drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch | 6 +++--- queue-2.6.39/mtd-return-badblockbits-back.patch | 6 +++--- queue-2.6.39/series | 1 + 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch b/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch index 4cf319a62bf..9eadfb63293 100644 --- a/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch +++ b/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch @@ -1,9 +1,9 @@ From 5bfa1063a775836a84f97e4df863fc36e1f856ad Mon Sep 17 00:00:00 2001 -From: "Feng, Boqun" +From: Boqun Feng Date: Mon, 16 May 2011 16:02:39 +0800 Subject: drm/i915: fix user irq miss in BSD ring on g4x -From: "Feng, Boqun" +From: Boqun Feng commit 5bfa1063a775836a84f97e4df863fc36e1f856ad upstream. @@ -26,7 +26,7 @@ To fix this, as other rings' code do, conditionally call different functions(i915_enable/disable_irq and ironlake_enable/disable_irq) and use different interrupt flags in bsd_ring_get/put_irq. -Signed-off-by: Feng, Boqun +Signed-off-by: Boqun Feng Reviewed-by: Xiang, Haihao Signed-off-by: Keith Packard Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.38/mtd-return-badblockbits-back.patch b/queue-2.6.38/mtd-return-badblockbits-back.patch index 6d6b3675b8e..ab14ca80e79 100644 --- a/queue-2.6.38/mtd-return-badblockbits-back.patch +++ b/queue-2.6.38/mtd-return-badblockbits-back.patch @@ -14,10 +14,10 @@ because otherwise some NAND drivers are broken. This problem was reported by "Saxena, Parth " here: http://lists.infradead.org/pipermail/linux-mtd/2011-April/035221.html -Reported-by: Saxena, Parth +Reported-by: Parth Saxena Signed-off-by: Artem Bityutskiy -Tested-by: Saxena, Parth -Acked-by: Saxena, Parth +Tested-by: Parth Saxena +Acked-by: Parth Saxena Acked-by: Brian Norris Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.38/series b/queue-2.6.38/series index 7d619f39a52..64fa9370158 100644 --- a/queue-2.6.38/series +++ b/queue-2.6.38/series @@ -143,3 +143,4 @@ nfsv4.1-fix-the-handling-of-nfs4err_seq_misordered-errors.patch pci-add-quirk-for-setting-valid-class-for-ti816x-endpoint.patch xen-mmu-fix-a-race-window-causing-leave_mm-bug.patch ext4-use-schedule_timeout_interruptible-for-waiting-in.patch +apparmor-fix-oops-in-apparmor_setprocattr.patch diff --git a/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch b/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch index 0000adf2a54..086d09fe49f 100644 --- a/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch +++ b/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch @@ -1,9 +1,9 @@ From 5bfa1063a775836a84f97e4df863fc36e1f856ad Mon Sep 17 00:00:00 2001 -From: "Feng, Boqun" +From: Boqun Feng Date: Mon, 16 May 2011 16:02:39 +0800 Subject: drm/i915: fix user irq miss in BSD ring on g4x -From: "Feng, Boqun" +From: Boqun Feng commit 5bfa1063a775836a84f97e4df863fc36e1f856ad upstream. @@ -26,7 +26,7 @@ To fix this, as other rings' code do, conditionally call different functions(i915_enable/disable_irq and ironlake_enable/disable_irq) and use different interrupt flags in bsd_ring_get/put_irq. -Signed-off-by: Feng, Boqun +Signed-off-by: Boqun Feng Reviewed-by: Xiang, Haihao Signed-off-by: Keith Packard Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.39/mtd-return-badblockbits-back.patch b/queue-2.6.39/mtd-return-badblockbits-back.patch index da7cef0b0e7..8aa7c6640cf 100644 --- a/queue-2.6.39/mtd-return-badblockbits-back.patch +++ b/queue-2.6.39/mtd-return-badblockbits-back.patch @@ -14,10 +14,10 @@ because otherwise some NAND drivers are broken. This problem was reported by "Saxena, Parth " here: http://lists.infradead.org/pipermail/linux-mtd/2011-April/035221.html -Reported-by: Saxena, Parth +Reported-by: Parth Saxena Signed-off-by: Artem Bityutskiy -Tested-by: Saxena, Parth -Acked-by: Saxena, Parth +Tested-by: Parth Saxena +Acked-by: Parth Saxena Acked-by: Brian Norris Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman diff --git a/queue-2.6.39/series b/queue-2.6.39/series index 9f21d6c8496..5ea745397f6 100644 --- a/queue-2.6.39/series +++ b/queue-2.6.39/series @@ -162,3 +162,4 @@ xen-mmu-fix-a-race-window-causing-leave_mm-bug.patch block-don-t-block-events-on-excl-write-for-non-optical.patch ext4-fix-possible-use-after-free-in.patch ext4-use-schedule_timeout_interruptible-for-waiting-in.patch +apparmor-fix-oops-in-apparmor_setprocattr.patch -- 2.47.3