kernel: bump 5.15 to 5.15.35

Patches automatically rebased.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
Rui Salvaterra 2022-04-20 09:07:51 +01:00 committed by Hauke Mehrtens
parent cab20be008
commit daa35a4d60
3 changed files with 8 additions and 10 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .34
LINUX_KERNEL_HASH-5.15.34 = a7514685392f0f89b337fa252a10a004c6a97d23e8d1126059c8e373398fdb69
LINUX_VERSION-5.15 = .35
LINUX_KERNEL_HASH-5.15.35 = 0a1a5ae2f30eb2b38215e59077f045aabd7f4e2857a881482f02ea48186105d8

View File

@ -1,7 +1,5 @@
Index: linux-5.15.31/net/ethernet/eth.c
===================================================================
--- linux-5.15.31.orig/net/ethernet/eth.c
+++ linux-5.15.31/net/ethernet/eth.c
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -544,6 +544,63 @@ int eth_platform_get_mac_address(struct
}
EXPORT_SYMBOL(eth_platform_get_mac_address);

View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -4573,6 +4586,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -4576,6 +4589,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag;
@@ -5351,6 +5367,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5354,6 +5370,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -5386,6 +5405,12 @@ static void ata_host_release(struct kref
@@ -5389,6 +5408,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -5792,7 +5817,23 @@ int ata_host_register(struct ata_host *h
@@ -5795,7 +5820,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}