merge origin/f26kernel-4.11.1-300.vanilla.knurd.1.fc26

3 files changed, 8 insertions, 125 deletions

diff --git a/kernel.spec b/kernel.spec
index cd02a1310..0048fa8f3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -44,7 +44,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 300
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -54,11 +54,11 @@ Summary: The Linux kernel
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
-
-# Do we have a -stable update to apply?
-%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
+
+# Do we have a -stable update to apply?  
+%define stable_update 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -641,9 +641,6 @@ Patch667: CVE-2017-7645.patch
 # CVE-2017-7477 rhbz 1445207 1445208
 Patch668: CVE-2017-7477.patch
 
-# Needed for compilation of external modules
-Patch669: refcount-change-EXPORT_SYMBOL-markings.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2211,6 +2208,9 @@ fi
 #
 #
 %changelog
+* Mon May 15 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.1-300
+- Linux v4.11.1
+
 * Tue May 09 2017 Laura Abbott <labbott@fedoraproject.org>
 - Fix EXPORT_SYMBOL for external modules that shall not be named
 
diff --git a/refcount-change-EXPORT_SYMBOL-markings.patch b/refcount-change-EXPORT_SYMBOL-markings.patch
deleted file mode 100644
index dce8d619b..000000000
--- a/refcount-change-EXPORT_SYMBOL-markings.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 829cf8de29d2e511bf64fdac0b6584067e419017 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 4 May 2017 15:51:03 -0700
-Subject: [PATCH] refcount: change EXPORT_SYMBOL markings
-
-Now that kref is using the refcount apis, the _GPL markings are getting
-exported to places that it previously wasn't.  Now kref.h is GPLv2
-licensed, so any non-GPL code using it better be talking to some
-lawyers, but changing api markings isn't considered "nice", so let's fix
-this up.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/refcount.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/lib/refcount.c b/lib/refcount.c
-index aa09ad3..26dffb7 100644
---- a/lib/refcount.c
-+++ b/lib/refcount.c
-@@ -62,13 +62,13 @@ bool refcount_add_not_zero(unsigned int i, refcount_t *r)
- 
- 	return true;
- }
--EXPORT_SYMBOL_GPL(refcount_add_not_zero);
-+EXPORT_SYMBOL(refcount_add_not_zero);
- 
- void refcount_add(unsigned int i, refcount_t *r)
- {
- 	WARN_ONCE(!refcount_add_not_zero(i, r), "refcount_t: addition on 0; use-after-free.\n");
- }
--EXPORT_SYMBOL_GPL(refcount_add);
-+EXPORT_SYMBOL(refcount_add);
- 
- /*
-  * Similar to atomic_inc_not_zero(), will saturate at UINT_MAX and WARN.
-@@ -101,7 +101,7 @@ bool refcount_inc_not_zero(refcount_t *r)
- 
- 	return true;
- }
--EXPORT_SYMBOL_GPL(refcount_inc_not_zero);
-+EXPORT_SYMBOL(refcount_inc_not_zero);
- 
- /*
-  * Similar to atomic_inc(), will saturate at UINT_MAX and WARN.
-@@ -113,7 +113,7 @@ void refcount_inc(refcount_t *r)
- {
- 	WARN_ONCE(!refcount_inc_not_zero(r), "refcount_t: increment on 0; use-after-free.\n");
- }
--EXPORT_SYMBOL_GPL(refcount_inc);
-+EXPORT_SYMBOL(refcount_inc);
- 
- bool refcount_sub_and_test(unsigned int i, refcount_t *r)
- {
-@@ -138,7 +138,7 @@ bool refcount_sub_and_test(unsigned int i, refcount_t *r)
- 
- 	return !new;
- }
--EXPORT_SYMBOL_GPL(refcount_sub_and_test);
-+EXPORT_SYMBOL(refcount_sub_and_test);
- 
- /*
-  * Similar to atomic_dec_and_test(), it will WARN on underflow and fail to
-@@ -152,7 +152,7 @@ bool refcount_dec_and_test(refcount_t *r)
- {
- 	return refcount_sub_and_test(1, r);
- }
--EXPORT_SYMBOL_GPL(refcount_dec_and_test);
-+EXPORT_SYMBOL(refcount_dec_and_test);
- 
- /*
-  * Similar to atomic_dec(), it will WARN on underflow and fail to decrement
-@@ -166,7 +166,7 @@ void refcount_dec(refcount_t *r)
- {
- 	WARN_ONCE(refcount_dec_and_test(r), "refcount_t: decrement hit 0; leaking memory.\n");
- }
--EXPORT_SYMBOL_GPL(refcount_dec);
-+EXPORT_SYMBOL(refcount_dec);
- 
- /*
-  * No atomic_t counterpart, it attempts a 1 -> 0 transition and returns the
-@@ -183,7 +183,7 @@ bool refcount_dec_if_one(refcount_t *r)
- {
- 	return atomic_cmpxchg_release(&r->refs, 1, 0) == 1;
- }
--EXPORT_SYMBOL_GPL(refcount_dec_if_one);
-+EXPORT_SYMBOL(refcount_dec_if_one);
- 
- /*
-  * No atomic_t counterpart, it decrements unless the value is 1, in which case
-@@ -217,7 +217,7 @@ bool refcount_dec_not_one(refcount_t *r)
- 
- 	return true;
- }
--EXPORT_SYMBOL_GPL(refcount_dec_not_one);
-+EXPORT_SYMBOL(refcount_dec_not_one);
- 
- /*
-  * Similar to atomic_dec_and_mutex_lock(), it will WARN on underflow and fail
-@@ -240,7 +240,7 @@ bool refcount_dec_and_mutex_lock(refcount_t *r, struct mutex *lock)
- 
- 	return true;
- }
--EXPORT_SYMBOL_GPL(refcount_dec_and_mutex_lock);
-+EXPORT_SYMBOL(refcount_dec_and_mutex_lock);
- 
- /*
-  * Similar to atomic_dec_and_lock(), it will WARN on underflow and fail to
-@@ -263,5 +263,5 @@ bool refcount_dec_and_lock(refcount_t *r, spinlock_t *lock)
- 
- 	return true;
- }
--EXPORT_SYMBOL_GPL(refcount_dec_and_lock);
-+EXPORT_SYMBOL(refcount_dec_and_lock);
- 
--- 
-2.7.4
-
diff --git a/sources b/sources
index 47d35657c..7b76f79ec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
+SHA512 (patch-4.11.1.xz) = e6cc334312655e8992da8834d09561191482961862c9f7ef5db44e3327db9994bf258412294271db8c3badd04c309f6cf12d6608a15fccdeec4039f50756fea8