kernel 6.3.7

5 files changed, 32 insertions, 97 deletions

diff --git a/SOURCES/asus-linux.patch b/SOURCES/asus-linux.patch
index d1a1204..11e3e80 100644
--- a/SOURCES/asus-linux.patch
+++ b/SOURCES/asus-linux.patch
@@ -18,7 +18,6 @@ Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
  drivers/platform/x86/asus-wmi.c               | 131 ++++++++++++++++++
  drivers/platform/x86/asus-wmi.h               |   1 +
  include/linux/platform_data/x86/asus-wmi.h    |   4 +
- sound/pci/hda/patch_realtek.c                 |  20 +++
  14 files changed, 250 insertions(+), 27 deletions(-)
 
 diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
@@ -503,55 +502,3 @@ index 28234dc9fa6a..a2d94adb5c80 100644
  #define ASUS_WMI_DEVID_FAN_BOOST_MODE	0x00110018
  #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
  
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 172ffc2c332b..ad7fdb5a4ed0 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7063,6 +7063,8 @@ enum {
- 	ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
- 	ALC295_FIXUP_DISABLE_DAC3,
- 	ALC285_FIXUP_SPEAKER2_TO_DAC1,
-+	ALC285_FIXUP_ASUS_HEADSET_MIC,
-+	ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1,
- 	ALC280_FIXUP_HP_HEADSET_MIC,
- 	ALC221_FIXUP_HP_FRONT_MIC,
- 	ALC292_FIXUP_TPT460,
-@@ -8033,6 +8035,22 @@ static const struct hda_fixup alc269_fixups[] = {
- 		.chained = true,
- 		.chain_id = ALC269_FIXUP_THINKPAD_ACPI
- 	},
-+	[ALC285_FIXUP_ASUS_HEADSET_MIC] = {
-+		.type = HDA_FIXUP_PINS,
-+		.v.pins = (const struct hda_pintbl[]) {
-+			{ 0x19, 0x03a11050 },
-+			{ 0x1b, 0x03a11c30 },
-+			{ }
-+		},
-+		.chained = true,
-+		.chain_id = ALC245_FIXUP_CS35L41_SPI_2
-+	},
-+	[ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1] = {
-+		.type = HDA_FIXUP_FUNC,
-+		.v.func = alc285_fixup_speaker2_to_dac1,
-+		.chained = true,
-+		.chain_id = ALC285_FIXUP_ASUS_HEADSET_MIC
-+	},
- 	[ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
- 		.type = HDA_FIXUP_PINS,
- 		.v.pins = (const struct hda_pintbl[]) {
-@@ -9504,6 +9522,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
- 	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
-+	SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
- 	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),
-@@ -9542,6 +9561,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
- 	SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
- 	SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101),
-+	SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604", ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1),
- 	SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
- 	SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
- 	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config
index eaf5651..19ea00e 100644
--- a/SOURCES/kernel-aarch64-debug-fedora.config
+++ b/SOURCES/kernel-aarch64-debug-fedora.config
@@ -1029,6 +1029,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CDX_CONTROLLER=m
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_GPIO=m
@@ -5885,7 +5886,7 @@ CONFIG_QCOM_HIDMA_MGMT=m
 # CONFIG_QCOM_ICC_BWMON is not set
 CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_IPA=m
-# CONFIG_QCOM_IPCC is not set
+CONFIG_QCOM_IPCC=m
 CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
@@ -6489,7 +6490,7 @@ CONFIG_SC_GCC_7280=y
 CONFIG_SC_GCC_8280XP=y
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config
index 6656fe0..6a4fa70 100644
--- a/SOURCES/kernel-aarch64-fedora.config
+++ b/SOURCES/kernel-aarch64-fedora.config
@@ -1029,6 +1029,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CDX_CONTROLLER=m
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_GPIO=m
@@ -5858,7 +5859,7 @@ CONFIG_QCOM_HIDMA_MGMT=m
 # CONFIG_QCOM_ICC_BWMON is not set
 CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_IPA=m
-# CONFIG_QCOM_IPCC is not set
+CONFIG_QCOM_IPCC=m
 CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
@@ -6462,7 +6463,7 @@ CONFIG_SC_GCC_7280=y
 CONFIG_SC_GCC_8280XP=y
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
diff --git a/SOURCES/patch-6.3-redhat.patch b/SOURCES/patch-6.3-redhat.patch
index fa1fd8a..61635aa 100644
--- a/SOURCES/patch-6.3-redhat.patch
+++ b/SOURCES/patch-6.3-redhat.patch
@@ -24,7 +24,6 @@
  drivers/nvme/host/nvme.h                           |   4 +
  drivers/pci/quirks.c                               |  24 ++++
  drivers/usb/core/hub.c                             |   7 ++
- fs/xfs/xfs_buf_item_recover.c                      |  10 ++
  include/linux/efi.h                                |  22 ++--
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/lsm_hooks.h                          |   6 +
@@ -37,10 +36,10 @@
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  sound/pci/hda/patch_realtek.c                      |   2 +
- 39 files changed, 519 insertions(+), 187 deletions(-)
+ 38 files changed, 509 insertions(+), 187 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 1dffadbf1f87..3775e1adc6c6 100644
+index 71c958fd5285..b4dd1352e20d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -104,10 +103,10 @@ index b0d00032479d..afb9544fb007 100644
  /*
   * DIAG 308 support
 diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 5f0f5c86963a..f02ea90d1d4b 100644
+index e43ee9becbbb..a167e34eaa56 100644
 --- a/arch/s390/kernel/ipl.c
 +++ b/arch/s390/kernel/ipl.c
-@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2518,3 +2518,8 @@ int ipl_report_free(struct ipl_report *report)
  }
 
  #endif
@@ -980,7 +979,7 @@ index 256a38371120..a77075a6abb5 100644
   * Changes the default domain of an iommu group that has *only* one device
   *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index bdf1601219fc..0a451e5e2621 100644
+index c015393beeee..d97dac7ae5a7 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -251,6 +251,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1047,7 +1046,7 @@ index bdf1601219fc..0a451e5e2621 100644
  #ifdef CONFIG_NVME_AUTH
  		queue_work(nvme_wq, &ctrl->dhchap_auth_work);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 9171452e2f6d..289bbb3523ce 100644
+index 2bc159a318ff..d5562a97f232 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
 @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@@ -1083,7 +1082,7 @@ index 9171452e2f6d..289bbb3523ce 100644
 
  	spin_lock_irqsave(&ns->head->requeue_lock, flags);
  	for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -905,8 +911,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -904,8 +910,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
  	int error = 0;
 
  	/* check if multipath is enabled and we have the capability */
@@ -1094,10 +1093,10 @@ index 9171452e2f6d..289bbb3523ce 100644
 
  	if (!ctrl->max_namespaces ||
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index bf46f122e9e1..06dd6bc08962 100644
+index a2d4f59e0535..1c5092b995e9 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
-@@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
+@@ -878,6 +878,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
  void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
  void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
  void nvme_failover_req(struct request *req);
@@ -1105,7 +1104,7 @@ index bf46f122e9e1..06dd6bc08962 100644
  void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
  int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
  void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid);
-@@ -911,6 +912,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
+@@ -916,6 +917,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
  static inline void nvme_failover_req(struct request *req)
  {
  }
@@ -1168,27 +1167,6 @@ index 97a0f8faea6e..d837548d2024 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
-diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
-index ffa94102094d..43167f543afc 100644
---- a/fs/xfs/xfs_buf_item_recover.c
-+++ b/fs/xfs/xfs_buf_item_recover.c
-@@ -943,6 +943,16 @@ xlog_recover_buf_commit_pass2(
- 	if (lsn && lsn != -1 && XFS_LSN_CMP(lsn, current_lsn) >= 0) {
- 		trace_xfs_log_recover_buf_skip(log, buf_f);
- 		xlog_recover_validate_buf_type(mp, bp, buf_f, NULLCOMMITLSN);
-+
-+		/*
-+		 * We're skipping replay of this buffer log item due to the log
-+		 * item LSN being behind the ondisk buffer.  Verify the buffer
-+		 * contents since we aren't going to run the write verifier.
-+		 */
-+		if (bp->b_ops) {
-+			bp->b_ops->verify_read(bp);
-+			error = bp->b_error;
-+		}
- 		goto out_release;
- 	}
-
 diff --git a/include/linux/efi.h b/include/linux/efi.h
 index 7aa62c92185f..2da17f5aeef9 100644
 --- a/include/linux/efi.h
@@ -1436,10 +1414,10 @@ index cf6cc576736f..3653a4f35265 100644
  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 379f216158ab..5711a9365a91 100644
+index 7b5f194513c7..9adf2930ff39 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -9706,6 +9706,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -9726,6 +9726,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
  	SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
  	SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 342f828..59a5845 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -142,18 +142,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specrpmversion 6.3.6
-%define specversion 6.3.6
+%define specrpmversion 6.3.7
+%define specversion 6.3.7
 %define patchversion 6.3
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.3.6
+%define tarfile_release 6.3.7
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 201%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.3.6
+%define kabiversion 6.3.7
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3448,8 +3448,16 @@ fi
 #
 #
 %changelog
-* Sat Jun 10 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.6-201.fsync
-- kernel-fsync v6.3.6
+* Tue Jun 13 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.7-201.fsync
+- kernel-fsync v6.3.7
+
+* Fri Jun 09 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.7-200]
+- Add a CVE to BugsFixed (Justin M. Forbes)
+
+* Fri Jun 09 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.7-0]
+- redhat/configs: Enable CONFIG_SC_GPUCC_8280XP for fedora (Andrew Halaney)
+- redhat/configs: Enable CONFIG_QCOM_IPCC for fedora (Andrew Halaney)
+- Linux v6.3.7
 
 * Mon Jun 05 2023 Augusto Caringi <acaringi@redhat.com> [6.3.6-0]
 - Add the nvidia bug to BugsFixed (Justin M. Forbes)