- 4.2.2

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 905698f15e67cf7faa0c6367450f78374a4b159e..01e03aa64da497ac17ba88984c47f9e05ec251da 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -97,43 +97,3 @@ index 28011fb1..c6ded6b 100644
        .pkts_acked     = bictcp_acked,
        .owner          = THIS_MODULE,
        .name           = "cubic",
-From: Tim Gardner <tim.gardner@canonical.com>
-
-commit 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 upstream.
-
-Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
-flush_scheduled_work() to workqueue.h") moved the exported non GPL
-flush_scheduled_work() from a function to an inline wrapper.
-Unfortunately, it directly calls flush_workqueue() which is a GPL function.
-This has the effect of changing the licensing requirement for this function
-and makes it unavailable to non GPL modules.
-
-See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
-schedule_work() available again to non GPL modules") for precedent.
-
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/workqueue.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_st
- out_unlock:
-       mutex_unlock(&wq->mutex);
- }
--EXPORT_SYMBOL_GPL(flush_workqueue);
-+EXPORT_SYMBOL(flush_workqueue);
- 
- /**
-  * drain_workqueue - drain a workqueue
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/

diff --git a/kernel.spec b/kernel.spec
index ae70fc517c549e3d8c20732c6c6aa1680b465bd3..b5a99177ba1fd94cbfe459104e43a88d4733188f 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
+%define                rel             1
 %define                basever         4.2
-%define                postver         .1
+%define                postver         .2
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -120,7 +120,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 3d5ea06d767e2f35c999eeadafc76523
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  3e1cc007d930f8760ef0730609dca035
+# Patch0-md5:  5c032ad548007cb8e28e0163c85dc5f9
 %endif
 Source1:       kernel.sysconfig