summaryrefslogtreecommitdiffstats
path: root/patch-5.14-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-10-17 11:01:44 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-10-17 11:01:44 -0500
commit1548053b71179a9ee6f7b60b980bbf9faf02097d (patch)
treea273a165caabd3b110a554a1e2a289658e92bb57 /patch-5.14-redhat.patch
parentcbdf08b91c6fef78ae7bcdf15ad83e912cedd2a8 (diff)
downloadkernel-1548053b71179a9ee6f7b60b980bbf9faf02097d.tar.gz
kernel-1548053b71179a9ee6f7b60b980bbf9faf02097d.tar.xz
kernel-1548053b71179a9ee6f7b60b980bbf9faf02097d.zip
kernel-5.14.13-100
* Sun Oct 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.13-100] - Fix changelog missing entries (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.14-redhat.patch')
-rw-r--r--patch-5.14-redhat.patch26
1 files changed, 25 insertions, 1 deletions
diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch
index 9907a16ab..5fe7628c6 100644
--- a/patch-5.14-redhat.patch
+++ b/patch-5.14-redhat.patch
@@ -42,6 +42,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
+ sound/soc/intel/boards/sof_sdw.c | 12 +
tools/testing/selftests/bpf/Makefile | 1 -
.../selftests/bpf/prog_tests/linked_funcs.c | 42 --
.../testing/selftests/bpf/prog_tests/linked_maps.c | 30 --
@@ -55,7 +56,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 57 files changed, 709 insertions(+), 1510 deletions(-)
+ 58 files changed, 721 insertions(+), 1510 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2fb7012c3246..47718b4f2f75 100644
@@ -1810,6 +1811,29 @@ index 9ffa9e9c5c55..36484cc9842d 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
+diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
+index cb3afc4519cf..6a12f9817e0b 100644
+--- a/sound/soc/intel/boards/sof_sdw.c
++++ b/sound/soc/intel/boards/sof_sdw.c
+@@ -128,6 +128,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
+ SOF_RT711_JD_SRC_JD2 |
+ SOF_RT715_DAI_ID_FIX),
+ },
++ {
++ /* Dell XPS 9710 */
++ .callback = sof_sdw_quirk_cb,
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D")
++ },
++ .driver_data = (void *)(SOF_SDW_TGL_HDMI |
++ RT711_JD2 |
++ SOF_RT715_DAI_ID_FIX |
++ SOF_SDW_FOUR_SPK),
++ },
+ {
+ .callback = sof_sdw_quirk_cb,
+ .matches = {
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 93f1f124ef89..70905889a07b 100644
--- a/tools/testing/selftests/bpf/Makefile