rpms/kernel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up merge issue

Browse source 
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2026-02-13 10:06:07 -07:00
commit 6e51ebecd0
No known key found for this signature in database
GPG key ID: B8FA7924A4B1C140
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
patch-6.20-redhat.patch
View file

@ -41,7 +41,7 @@
drivers/pci/quirks.c | 24 +
drivers/scsi/hpsa.c | 4 +
drivers/scsi/qla2xxx/qla_os.c | 6 +
drivers/scsi/sd.c | 19 +
drivers/scsi/sd.c | 13 +
drivers/usb/core/hub.c | 7 +
fs/afs/main.c | 3 +
fs/erofs/super.c | 9 +
@ -78,7 +78,7 @@
security/lockdown/lockdown.c | 11 +
tools/testing/selftests/bpf/Makefile | 2 +-
tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 --
80 files changed, 2818 insertions(+), 243 deletions(-)
80 files changed, 2812 insertions(+), 243 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 0869294363b3a..6868f148235fa 100644
@ -2190,7 +2190,7 @@ index a88b460641f26..317274b6f1563 100644
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d76996d6cbc9c..1989f126cb9a7 100644
index d76996d6cbc9c..c815d3ae39aed 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -116,6 +116,14 @@ static const char *sd_cache_types[] = {
@ -2208,25 +2208,18 @@ index d76996d6cbc9c..1989f126cb9a7 100644
static void sd_disable_discard(struct scsi_disk *sdkp)
{
sdkp->provisioning_mode = SD_LBP_DISABLE;
@@ -4406,7 +4414,18 @@ static int __init init_sd(void)
@@ -4406,6 +4414,11 @@ static int __init init_sd(void)
goto err_out_class;
}
+<<<<<<< HEAD
+#ifdef CONFIG_RHEL_DIFFERENCES
+ if (!strcmp(sd_probe_type, "sync"))
+ sd_template.gendrv.probe_type = PROBE_FORCE_SYNCHRONOUS;
+#endif
+
+ err = scsi_register_driver(&sd_template.gendrv);
+||||||| 37a93dd5c49b5
+ err = scsi_register_driver(&sd_template.gendrv);
+=======
err = scsi_register_driver(&sd_template);
+>>>>>>> master
if (err)
goto err_out_driver;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index be50d03034a96..9ce9b6518acd5 100644
--- a/drivers/usb/core/hub.c