rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.11.0-155 

* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-155]
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-02-15 15:00:40 -06:00
parent 0b7b6f6603
commit d24ad453a6
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 151
RHEL_RELEASE = 155
#
# Early y+1 numbering

4
Patchlist.changelog
View File

@ -1,5 +1,5 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/f5cfdf2dfb7373853ec833e63fffff45bc9bf37d
f5cfdf2dfb7373853ec833e63fffff45bc9bf37d Bluetooth: L2CAP: Try harder to accept device not knowing options
https://gitlab.com/cki-project/kernel-ark/-/commit/d56aab49af72b2e0e682cc70c0f19269f784607a
d56aab49af72b2e0e682cc70c0f19269f784607a Bluetooth: L2CAP: Try harder to accept device not knowing options
https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2
06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option

22
kernel.spec
View File

@ -64,7 +64,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
%global distro_build 0.rc7.20210212git291009f656e8.151
%global distro_build 155
%if 0%{?fedora}
%define secure_boot_arch x86_64
@ -105,13 +105,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.0
%define pkgrelease 0.rc7.20210212git291009f656e8.151
%define pkgrelease 155
# This is needed to do merge window version magic
%define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc7.20210212git291009f656e8.151%{?buildid}%{?dist}
%define specrelease 155%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -201,7 +201,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 0
%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.11
@ -602,7 +602,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-20210212git291009f656e8.tar.xz
Source0: linux-5.11.tar.xz
Source1: Makefile.rhelver
@ -1250,8 +1250,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-20210212git291009f656e8 -c
mv linux-20210212git291009f656e8 linux-%{KVERREL}
%setup -q -n kernel-5.11 -c
mv linux-5.11 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -2762,9 +2762,15 @@ fi
#
#
%changelog
* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.151]
* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-155]
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-154]
- process_configs.sh: fix find/xargs data flow (Ondrej Mosnacek)
* Sat Feb 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210213gitdcc0b49040c7.151]
- Fedora config update (Justin M. Forbes)
* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.150]
- fedora: minor arm sound config updates (Peter Robinson)

2
patch-5.11.0-redhat.patch
View File

@ -204,7 +204,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index ade44ac4cc2f..0c4b4407dd7f 100644
index de1acaefe87e..99e67e7e316e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

2
process_configs.sh
View File

@ -79,7 +79,7 @@ checkoptions()
then
while read -r LINE
do
if find ./ -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
if find ./ -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
# This is a known broken config.
# See script help warning.
checkoptions_error=false

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-20210212git291009f656e8.tar.xz) = 6aa1d721fd41184a76ba94daacfd443c7efa61e9dd726db09a63db8776bfe02e9182440285f2137ed9192cca4692a08f55caebc227e934c19bb650c32fcfa55c
SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210212git291009f656e8.151.tar.bz2) = 0a647f51675dc0ebc862fcd1b8b4b50decd4c348181082c9f86eceb07ee01f4990f5ecf5aadd5beb31edf300361cbf7637d09b051c59830292652a3ca1af1712
SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210212git291009f656e8.151.tar.bz2) = 449110eaef2ac7b8414d481a20755d03f4217e42676e08fce979473641468c36680e4f3e7152c276a3df177e356d25a6ca751d29545b02d418e2fdb64d9f6425
SHA512 (linux-5.11.tar.xz) = 03db5b248184f9bf788eade7f39c0d039c9d58a0523c8815ddd3c9157984eedb536523dd1a17251b62de570845280f8ba5008ff599b07f8693bd46cd5b16b769
SHA512 (kernel-abi-whitelists-5.11.0-155.tar.bz2) = 8deb1e130c3dd0d5590aba752533e0329cbadbd3475948bd89dac125a81fe5efbbeb62340ea7cc106cf1ec828b407b8055044f879c8154295e1531067a61c57b
SHA512 (kernel-kabi-dw-5.11.0-155.tar.bz2) = 6a5f17e92cbe6afddd89c8a0f9f603b4cb120113328f11189c45aa3da08a6bbbc20c4aab6c24ac3ac14a8549adda91081c049e4370c7809765d159898181ff8d