kernel 5.12.7

3 files changed, 18 insertions, 59 deletions

diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index e0e542c..3c544c0 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/b8c43c4d0bdf8d9f4210e9f3263771c9f76d12bc
+ b8c43c4d0bdf8d9f4210e9f3263771c9f76d12bc Fix up merge issue resulting in dual entries for ALC295_FIXUP_ASUS_DACS
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/640004f918263da53d6f657817cc06089a3c2f93
+ 640004f918263da53d6f657817cc06089a3c2f93 powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/00f96bf907caf6f5bd6ff876958aa9a1bb45f969
  00f96bf907caf6f5bd6ff876958aa9a1bb45f969 bus: mhi: core: Download AMSS image from appropriate function
 
diff --git a/SOURCES/patch-5.12-redhat.patch b/SOURCES/patch-5.12-redhat.patch
index c8ad8ab..8392e61 100644
--- a/SOURCES/patch-5.12-redhat.patch
+++ b/SOURCES/patch-5.12-redhat.patch
@@ -40,8 +40,7 @@
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- sound/pci/hda/patch_realtek.c                      |  18 +++
- 43 files changed, 670 insertions(+), 193 deletions(-)
+ 42 files changed, 652 insertions(+), 193 deletions(-)
 
 diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
 index 75a9dd98e76e..3ff3291551f9 100644
@@ -66,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index dd021135838b..834afa29b14c 100644
+index 6a73dee7c221..585dfe88d94c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -495,6 +495,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -1635,53 +1634,3 @@ index 5ac96b16f8fa..fc47d6de57ee 100644
  #ifdef CONFIG_PERF_EVENTS
  int security_perf_event_open(struct perf_event_attr *attr, int type)
  {
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 1fe70f2fe4fe..af80edb21bbb 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5717,6 +5717,18 @@ static void alc_fixup_tpt470_dacs(struct hda_codec *codec,
- 		spec->gen.preferred_dacs = preferred_pairs;
- }
-
-+static void alc295_fixup_asus_dacs(struct hda_codec *codec,
-+				   const struct hda_fixup *fix, int action)
-+{
-+	static const hda_nid_t preferred_pairs[] = {
-+		0x17, 0x02, 0x21, 0x03, 0
-+	};
-+	struct alc_spec *spec = codec->spec;
-+
-+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
-+		spec->gen.preferred_dacs = preferred_pairs;
-+}
-+
- static void alc_shutup_dell_xps13(struct hda_codec *codec)
- {
- 	struct alc_spec *spec = codec->spec;
-@@ -6484,6 +6496,7 @@ enum {
- 	ALC282_FIXUP_ACER_DISABLE_LINEOUT,
- 	ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST,
- 	ALC256_FIXUP_ACER_HEADSET_MIC,
-+	ALC295_FIXUP_ASUS_DACS,
- 	ALC285_FIXUP_IDEAPAD_S740_COEF,
- };
-
-@@ -7977,6 +7990,10 @@ static const struct hda_fixup alc269_fixups[] = {
- 		.chained = true,
- 		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
- 	},
-+	[ALC295_FIXUP_ASUS_DACS] = {
-+		.type = HDA_FIXUP_FUNC,
-+		.v.func = alc295_fixup_asus_dacs,
-+	},
- 	[ALC285_FIXUP_IDEAPAD_S740_COEF] = {
- 		.type = HDA_FIXUP_FUNC,
- 		.v.func = alc285_fixup_ideapad_s740_coef,
-@@ -8181,6 +8198,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
- 	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
- 	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
-+	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
- 	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
- 	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
- 	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 0bff12c..718ff0f 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -106,7 +106,7 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-%define rpmversion 5.12.6
+%define rpmversion 5.12.7
 %define stableversion 5.12
 %define pkgrelease 301
 
@@ -623,7 +623,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12.6.tar.xz
+Source0: linux-5.12.7.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1281,8 +1281,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.12.6 -c
-mv linux-5.12.6 linux-%{KVERREL}
+%setup -q -n kernel-5.12.7 -c
+mv linux-5.12.7 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2800,8 +2800,12 @@ fi
 #
 #
 %changelog
-* Tue May 25 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.6-301.fsync
-- Linux v5.12.6 futex2 zen
+* Fri May 28 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.7-301.fsync
+- Linux v5.12.7 futex2 zen
+
+* Wed May 26 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.7-0]
+- Fix up merge issue resulting in dual entries for ALC295_FIXUP_ASUS_DACS (Justin M. Forbes)
+- powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls (Nicholas Piggin)
 
 * Sat May 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.6-0]
 - bus: mhi: core: Download AMSS image from appropriate function (Bhaumik Bhatt)