From: Greg Kroah-Hartman Date: Fri, 28 Sep 2012 20:26:10 +0000 (-0700) Subject: queue-3.4: fix up some patches to make quilt mail happier X-Git-Tag: v3.0.44~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de9ec410ba17d0ad69eb6405ffef1f39d05b8386;p=thirdparty%2Fkernel%2Fstable-queue.git queue-3.4: fix up some patches to make quilt mail happier --- diff --git a/queue-3.4/net-qmi_wwan-add-sierra-wireless-devices.patch b/queue-3.4/net-qmi_wwan-add-sierra-wireless-devices.patch index 4e58e881e9e..3d6555e3db4 100644 --- a/queue-3.4/net-qmi_wwan-add-sierra-wireless-devices.patch +++ b/queue-3.4/net-qmi_wwan-add-sierra-wireless-devices.patch @@ -3,7 +3,6 @@ From: Bj Date: Thu, 23 Aug 2012 12:13:57 +0200 Subject: net: qmi_wwan: add Sierra Wireless devices To: stable@vger.kernel.org -Cc: Bjørn Mork , David Miller Message-ID: <1345716838-24023-7-git-send-email-bjorn@mork.no> From: Bjørn Mork diff --git a/queue-3.4/net-qmi_wwan-new-devices-uml290-and-k5006-z.patch b/queue-3.4/net-qmi_wwan-new-devices-uml290-and-k5006-z.patch index 8ad97e9ab9d..d900b5d37ab 100644 --- a/queue-3.4/net-qmi_wwan-new-devices-uml290-and-k5006-z.patch +++ b/queue-3.4/net-qmi_wwan-new-devices-uml290-and-k5006-z.patch @@ -3,8 +3,6 @@ From: Bj Date: Thu, 23 Aug 2012 12:13:58 +0200 Subject: net: qmi_wwan: new devices: UML290 and K5006-Z To: stable@vger.kernel.org -Cc: Bjørn Mork , David Miller , Dan Williams , Thomas Schäfer -Message-ID: <1345716838-24023-8-git-send-email-bjorn@mork.no> From: Bjørn Mork @@ -16,10 +14,10 @@ that as well. The ZTE (Vodafone) K5006-Z is a new device. +Signed-off-by: Bjørn Mork Cc: Dan Williams Cc: Thomas Schäfer [bmork: backported to 3.4: use driver whitelisting] -Signed-off-by: Bjørn Mork Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-3.4/revert-drm-i915-correctly-order-the-ring-init-sequence.patch b/queue-3.4/revert-drm-i915-correctly-order-the-ring-init-sequence.patch index 818e16392a4..cff30510ac3 100644 --- a/queue-3.4/revert-drm-i915-correctly-order-the-ring-init-sequence.patch +++ b/queue-3.4/revert-drm-i915-correctly-order-the-ring-init-sequence.patch @@ -9,7 +9,7 @@ This reverts commit 57ecc93ce680b1ace1f9e79d588dabe32353202c which really is commit 0d8957c8a90bbb5d34fab9a304459448a5131e06 upstream as it has been reported to cause problems in the 3.4.y kernel series. -Cc: Herton Ronaldo Krzesinski +Reported-by: Herton Ronaldo Krzesinski Cc: Andreas Sturmlechner Cc: Jani Nikula Cc: Yang Guang diff --git a/queue-3.4/time-avoid-making-adjustments-if-we-haven-t-accumulated-anything.patch b/queue-3.4/time-avoid-making-adjustments-if-we-haven-t-accumulated-anything.patch index c27c10e254e..5e3b8574abb 100644 --- a/queue-3.4/time-avoid-making-adjustments-if-we-haven-t-accumulated-anything.patch +++ b/queue-3.4/time-avoid-making-adjustments-if-we-haven-t-accumulated-anything.patch @@ -3,7 +3,6 @@ From: John Stultz Date: Tue, 11 Sep 2012 15:04:18 -0400 Subject: time: Avoid making adjustments if we haven't accumulated anything To: stable@vger.kernel.org -Cc: John Stultz , Prarit Bhargava , Ingo Molnar , Thomas Gleixner Message-ID: <1347390259-54838-3-git-send-email-john.stultz@linaro.org> From: John Stultz diff --git a/queue-3.4/time-improve-sanity-checking-of-timekeeping-inputs.patch b/queue-3.4/time-improve-sanity-checking-of-timekeeping-inputs.patch index 1367f36edd1..9ef6b2aed05 100644 --- a/queue-3.4/time-improve-sanity-checking-of-timekeeping-inputs.patch +++ b/queue-3.4/time-improve-sanity-checking-of-timekeeping-inputs.patch @@ -3,7 +3,6 @@ From: John Stultz Date: Tue, 11 Sep 2012 15:04:17 -0400 Subject: time: Improve sanity checking of timekeeping inputs To: stable@vger.kernel.org -Cc: John Stultz , Peter Zijlstra , Prarit Bhargava , Zhouping Liu , Ingo Molnar , Thomas Gleixner Message-ID: <1347390259-54838-2-git-send-email-john.stultz@linaro.org> From: John Stultz diff --git a/queue-3.4/time-move-ktime_t-overflow-checking-into-timespec_valid_strict.patch b/queue-3.4/time-move-ktime_t-overflow-checking-into-timespec_valid_strict.patch index 584aa8a138b..f3ee6e0ff7d 100644 --- a/queue-3.4/time-move-ktime_t-overflow-checking-into-timespec_valid_strict.patch +++ b/queue-3.4/time-move-ktime_t-overflow-checking-into-timespec_valid_strict.patch @@ -3,7 +3,6 @@ From: John Stultz Date: Tue, 11 Sep 2012 15:04:19 -0400 Subject: time: Move ktime_t overflow checking into timespec_valid_strict To: stable@vger.kernel.org -Cc: John Stultz , Zhouping Liu , Ingo Molnar , Prarit Bhargava , Thomas Gleixner , Linus Torvalds Message-ID: <1347390259-54838-4-git-send-email-john.stultz@linaro.org> From: John Stultz diff --git a/queue-3.4/tracing-don-t-call-page_to_pfn-if-page-is-null.patch b/queue-3.4/tracing-don-t-call-page_to_pfn-if-page-is-null.patch index ae7dd8b9c6a..713a81191a9 100644 --- a/queue-3.4/tracing-don-t-call-page_to_pfn-if-page-is-null.patch +++ b/queue-3.4/tracing-don-t-call-page_to_pfn-if-page-is-null.patch @@ -12,10 +12,10 @@ cause the kernel panicked if we don't use sparsemem vmemmap. Link: http://lkml.kernel.org/r/505AB1FF.8020104@cn.fujitsu.com +Acked-by: Mel Gorman Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Andrew Morton -Acked-by: Mel Gorman Reviewed-by: Minchan Kim Signed-off-by: Wen Congyang Signed-off-by: Steven Rostedt diff --git a/queue-3.4/ubi-fix-a-horrible-memory-deallocation-bug.patch b/queue-3.4/ubi-fix-a-horrible-memory-deallocation-bug.patch index 4dabdd45e04..714cc381728 100644 --- a/queue-3.4/ubi-fix-a-horrible-memory-deallocation-bug.patch +++ b/queue-3.4/ubi-fix-a-horrible-memory-deallocation-bug.patch @@ -3,7 +3,6 @@ From: Artem Bityutskiy Date: Wed, 12 Sep 2012 09:05:22 +0200 Subject: UBI: fix a horrible memory deallocation bug To: stable@vger.kernel.org -Cc: Artem Bityutskiy , Richard Genoud Message-ID: <1347433522-1243-1-git-send-email-richard.genoud@gmail.com> From: Artem Bityutskiy