diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 09:14:25 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 09:14:25 +0100 |
commit | fea21ec9cdc01b3e6a8991c8253a2c484f34c6df (patch) | |
tree | ebcf5762ec88db709c4f901b160c10c0351e1014 | |
parent | 84896e92764967eae4fbb329e22a1868ad14eb16 (diff) | |
parent | d24ad453a6273ee9dec91d3d7caf072b8a2817e3 (diff) | |
download | kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.tar.gz kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.tar.xz kernel-fea21ec9cdc01b3e6a8991c8253a2c484f34c6df.zip |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | Patchlist.changelog | 4 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 3 | ||||
-rwxr-xr-x | kernel.spec | 25 | ||||
-rw-r--r-- | patch-5.11.0-redhat.patch | 2 | ||||
-rwxr-xr-x | process_configs.sh | 2 | ||||
-rw-r--r-- | sources | 6 |
8 files changed, 29 insertions, 18 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 57aae48c9..421345263 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 = 155 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 42a7e636c..98472eeb6 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/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 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 21114d5c4..ebb66024f 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 cc9324224..87614cacf 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 2f671d5d2..a108f6522 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.20210210gite0756cfc7d7c.150 +%global distro_build 155 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc7.20210210gite0756cfc7d7c.150 +%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.20210210gite0756cfc7d7c.150%{?buildid}%{?dist} +%define specrelease 155%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -203,7 +203,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 @@ -604,7 +604,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210210gite0756cfc7d7c.tar.xz +Source0: linux-5.11.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210210gite0756cfc7d7c -c -mv linux-20210210gite0756cfc7d7c linux-%{KVERREL} +%setup -q -n kernel-5.11 -c +mv linux-5.11 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,9 +2756,18 @@ fi # # %changelog -* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150] +* 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) + * Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 593698624..5781e5af4 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -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)), \ diff --git a/process_configs.sh b/process_configs.sh index c1e81ca16..166d4766e 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -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 @@ -1,3 +1,3 @@ -SHA512 (linux-20210210gite0756cfc7d7c.tar.xz) = fa89f72e7175f26ea2f3e0439bf1488ba813ccebadbf4218f063316bcbd1333a442f1ef4ec102fac8dd434dcd4f7b15748a0ab5c0165d734caa9bbed0fad0b85 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = c53c44ca06406839629d1b26e561762ae3c1a73bf1122c41482817f2a631245ae01e43323e512d384006e14f5f1ee663a0092911933f293224bf958e7c6176c6 -SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = 54ea3805dd27d830da8843606c31abf2958359d6c02b348fc2b672444799a239c43103257e080a4e10034211122779fb5096875542697be138f72d8759f9f3f1 +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 |