Merge branch 'master' into f26

This commit is contained in:
Peter Robinson 2017-03-13 21:51:47 +00:00
commit e4d5f75352
2 changed files with 12 additions and 2 deletions

View File

@ -42,7 +42,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 1
%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -531,7 +531,7 @@ Patch430: bcm2837-initial-support.patch
Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
# bcm283x mmc for wifi http://www.spinics.net/lists/arm-kernel/msg567077.html
Patch434: bcm283x-mmc-bcm2835.patch
# Patch434: bcm283x-mmc-bcm2835.patch
# Upstream fixes for i2c/serial/ethernet MAC addresses
Patch435: bcm283x-fixes.patch
@ -2163,6 +2163,9 @@ fi
#
#
%changelog
* Mon Mar 13 2017 Peter Robinson <pbrobinson@fedoraproject.org> 4.11.0-0.rc2.git0.2
- Disable bcm283x mmc improvements due to corner case issues
* Mon Mar 13 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git0.1
- Linux v4.11-rc2

View File

@ -3,6 +3,13 @@
source scripts/kernel-version.sh
klist -s
if [ ! $? -eq 0 ]; then
echo "klist couldn't read the credential cache."
echo "Do you need to fix your kerberos tokens?"
exit 1
fi
make release
# fixup the release because rpmdev-bumpspec *sigh*
scripts/fixup-bumpspec.sh