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>
This commit is contained in:
committed by
Hauke Mehrtens
parent
d9c2b0cfdd
commit
7bf62e2451
@@ -334,7 +334,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
|
||||
@@ -2420,7 +2420,6 @@ static int bcm_sysport_probe(struct plat
|
||||
@@ -2423,7 +2423,6 @@ static int bcm_sysport_probe(struct plat
|
||||
struct bcm_sysport_priv *priv;
|
||||
struct device_node *dn;
|
||||
struct net_device *dev;
|
||||
@@ -342,7 +342,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
u32 txq, rxq;
|
||||
int ret;
|
||||
|
||||
@@ -2502,12 +2501,10 @@ static int bcm_sysport_probe(struct plat
|
||||
@@ -2505,12 +2504,10 @@ static int bcm_sysport_probe(struct plat
|
||||
}
|
||||
|
||||
/* Initialize netdevice members */
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user