Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc7.20210212git291009f656e8.151.vanilla.1.fc34kernel-5.11.0-0.rc7.20210212git291009f656e8.151.vanilla.1.fc33kernel-5.11.0-0.rc7.20210212git291009f656e8.151.vanilla.1.fc32

6 files changed, 20 insertions, 15 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 57aae48c9..7d49025e6 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 42a7e636c..971aa9352 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 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 985f329c1..e82a2793f 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 0.rc7.20210212git291009f656e8.151
 
 %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 0.rc7.20210212git291009f656e8.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.20210210gite0756cfc7d7c.150%{?buildid}%{?dist}
+%define specrelease 0.rc7.20210212git291009f656e8.151%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -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-20210212git291009f656e8.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-20210212git291009f656e8 -c
+mv linux-20210212git291009f656e8 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2756,9 +2756,12 @@ fi
 #
 #
 %changelog
-* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150]
+* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <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/sources b/sources
index f2c56ee06..db2b17a6a 100644
--- a/sources
+++ b/sources
@@ -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-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