aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-29 10:23:53 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-03 01:00:03 +0100
commit7bf62e2451100620925b66dfee9c0a97dfbab90e (patch)
treed274ecbe514b5f2fbdd7123aef96a9a0c3b185bc /target/linux/generic/pending-5.4
parentd9c2b0cfdd1c8a377c7fa67e34437a726cf16d08 (diff)
downloadupstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.gz
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.bz2
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.zip
kernel: bump 5.4 to 5.4.169
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *Had to revert 7f1edbd in order to build due to FS#4149 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.4')
-rw-r--r--target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch b/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
index bec9363fa1..c4cbaaa777 100644
--- a/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
+++ b/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
@@ -41,7 +41,7 @@ ChangeLog v1->v2:
#include "libata.h"
#include "libata-transport.h"
-@@ -4579,6 +4580,34 @@ int ata_scsi_add_hosts(struct ata_host *
+@@ -4590,6 +4591,34 @@ int ata_scsi_add_hosts(struct ata_host *
return rc;
}
@@ -76,7 +76,7 @@ ChangeLog v1->v2:
void ata_scsi_scan_host(struct ata_port *ap, int sync)
{
int tries = 5;
-@@ -4604,6 +4633,7 @@ void ata_scsi_scan_host(struct ata_port
+@@ -4615,6 +4644,7 @@ void ata_scsi_scan_host(struct ata_port
NULL);
if (!IS_ERR(sdev)) {
dev->sdev = sdev;