Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc3.git1.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc3.git1.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc3.git1.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc3.git1.1.vanilla.knurd.1.fc24

4 files changed, 71 insertions, 3 deletions

diff --git a/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch b/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
new file mode 100644
index 000000000..ab048d1c9
--- /dev/null
+++ b/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
@@ -0,0 +1,55 @@
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: 2017-03-22 15:08:33
+Subject: [PATCH 4.11] genetlink: fix counting regression on ctrl_dumpfamily()
+
+Commit 2ae0f17df1cd ("genetlink: use idr to track families") replaced
+
+	if (++n < fams_to_skip)
+		continue;
+into:
+
+	if (n++ < fams_to_skip)
+		continue;
+
+This subtle change cause that on retry ctrl_dumpfamily() call we omit
+one family that failed to do ctrl_fill_info() on previous call, because
+cb->args[0] = n number counts also family that failed to do
+ctrl_fill_info().
+
+Patch fixes the problem and avoid confusion in the future just decrease
+n counter when ctrl_fill_info() fail.
+
+User visible problem caused by this bug is failure to get access to
+some genetlink family i.e. nl80211. However problem is reproducible
+only if number of registered genetlink families is big enough to
+cause second call of ctrl_dumpfamily().
+
+Cc: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Cc: Larry Finger <Larry.Finger@lwfinger.net>
+Cc: Johannes Berg <johannes@sipsolutions.net>
+Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+---
+Dave, please also target this for 4.10+ -stable.
+
+ net/netlink/genetlink.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
+index fb6e10f..92e0981 100644
+--- a/net/netlink/genetlink.c
++++ b/net/netlink/genetlink.c
+@@ -783,8 +783,10 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
+ 
+ 		if (ctrl_fill_info(rt, NETLINK_CB(cb->skb).portid,
+ 				   cb->nlh->nlmsg_seq, NLM_F_MULTI,
+-				   skb, CTRL_CMD_NEWFAMILY) < 0)
++				   skb, CTRL_CMD_NEWFAMILY) < 0) {
++			n--;
+ 			break;
++		}
+ 	}
+ 
+ 	cb->args[0] = n;
+-- 
+1.7.1
diff --git a/gitrev b/gitrev
index 6585c4b14..6230bcf0d 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-d528ae0d3dfedea553812c957a6ed1e87feeed8a
+093b995e3b55a0ae0670226ddfcb05bfbf0099ae
diff --git a/kernel.spec b/kernel.spec
index b0ac28196..28bffaa93 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -622,6 +622,9 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 # grabbed from mailing list
 Patch667: v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch
 
+# Fix crda rhbz 1422247
+Patch668: genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2189,6 +2192,15 @@ fi
 #
 #
 %changelog
+* Wed Mar 22 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix crda (rhbz 1422247)
+
+* Wed Mar 22 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc3.git1.1
+- Linux v4.11-rc3-35-g093b995
+
+* Wed Mar 22 2017 Laura Abbott <labbott@fedoraproject.org>
+- Reenable debugging options.
+
 * Tue Mar 21 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add initial support for vc4 HDMI Audio
 
diff --git a/sources b/sources
index cbf2fc9e9..8cbdf9580 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
 SHA512 (patch-4.11-rc3.xz) = 88ff442fdcc41cd3734ddabc3cee54ea15ff5fef6b3bc1edc8f8c904ac888b45942a483ae35e3fee1a3b050d925755501b53de2e241a98905f63bb763a389086
+SHA512 (patch-4.11-rc3-git1.xz) = 2021cf4ea7f7f16b6520230bde793f00d105d1eff0b828f3c34634b52c6940c342c11dc49ebedf99404962f01c8b6be98da1c415a17e3de716f07c05c457582b