diff --git a/Makefile.rhelver b/Makefile.rhelver index 57aae48..7d49025 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 150 +RHEL_RELEASE = 151 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 42a7e63..971aa93 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/5bd5db57713dba41e3a6df6538c4c3063aa53fb7 - 5bd5db57713dba41e3a6df6538c4c3063aa53fb7 Bluetooth: L2CAP: Try harder to accept device not knowing options +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/06219afd635737bfee1a7c676258e66448f133e2 06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 21114d5..ebb6602 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6625,7 +6625,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_QDSP6=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m -# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RK3328=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -6637,6 +6637,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_RT1308_SDW=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_RT5660=m CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5677=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index cc93242..87614ca 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6601,7 +6601,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_QDSP6=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m -# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RK3328=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -6613,6 +6613,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_RT1308_SDW=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_RT5660=m CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5677=m diff --git a/kernel.spec b/kernel.spec index 471337b..899cfdd 100755 --- a/kernel.spec +++ b/kernel.spec @@ -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.150 +%global distro_build 0.rc7.151 %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.150 +%define pkgrelease 0.rc7.151 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.150%{?buildid}%{?dist} +%define specrelease 0.rc7.151%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -602,7 +602,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc7.150.tar.xz +Source0: linux-5.11.0-0.rc7.151.tar.xz Source1: Makefile.rhelver @@ -1250,8 +1250,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc7.150 -c -mv linux-5.11.0-0.rc7.150 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc7.151 -c +mv linux-5.11.0-0.rc7.151 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2762,12 +2762,15 @@ fi # # %changelog -* Wed Feb 10 2021 Herton R. Krzesinski [5.11.0-0.rc7.150] -- v5.11-rc7-2-ge0756cfc7d7c rebase +* Fri Feb 12 2021 Herton R. Krzesinski [5.11.0-0.rc7.151] +- v5.11-rc7-84-g291009f656e8 rebase -* Wed Feb 10 2021 Fedora Kernel Team [5.11.0-0.rc7.20210210gite0756cfc7d7c.150] +* Fri Feb 12 2021 Fedora Kernel Team [5.11.0-0.rc7.20210212git291009f656e8.151] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* Fri Feb 12 2021 Fedora Kernel Team [5.11.0-0.rc7.20210212git291009f656e8.150] +- fedora: minor arm sound config updates (Peter Robinson) + * Wed Feb 10 2021 Fedora Kernel Team [5.11.0-0.rc7.20210210gite0756cfc7d7c.149] - Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes) - Add a redhat/rebase-notes.txt file (Hans de Goede) diff --git a/sources b/sources index 340b3c5..7bab747 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc7.150.tar.xz) = 4a77eb92cdecab2566e243133fe2d9dc8e277e06590d9a4f7155b93001c701b5ce7c00f8b653a60bb22d9a585b3a0baea509faf5bdc17f4f93d824df5d384650 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.150.tar.bz2) = 288366d9bba47d85ea8d90355c53007edaf5e34e25d297c7f10549feba0f4ac8cf9a1ed27cd63a4144384fb8c7d7ac58ee35218fbd9816ff83e82724496915bf -SHA512 (kernel-kabi-dw-5.11.0-0.rc7.150.tar.bz2) = a9c2e4f20c694e71ee1c01136909fcd8170dc6b203cc095c6ef4879cee73126dea03e5ba4fa140030ba922caef7435602b9bb56a491fe76e73b71b2dc1990deb +SHA512 (linux-5.11.0-0.rc7.151.tar.xz) = b6bce9a2fa5cb263b4b1768c84dc8bf15a00ce91550d4917cb0b75007d254bbe37a377a767e0d6e4979be0abdb76753f1b83ddd4d4743339fbda87dc7bd7d917 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.151.tar.bz2) = 1c44219fdbc09e78f6659b7818ec12a3836bbf543378fe65935d54f533f3c67c640a9ca053c039634e949f6b11db60245d886b45b7442b3765f2ade12cd32774 +SHA512 (kernel-kabi-dw-5.11.0-0.rc7.151.tar.bz2) = 4a0c67e46e1581fe1eb5ad76000f2a953c09f81324f92da870c4e2d2f1ee3b8d5a1caba12dc9f219166cf657e7ec18d1f61855f7c3d9dbbc7dd57fd933cffb32