🎁 Sync 2026-01-20 12:01:28
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 17s
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 17s
This commit is contained in:
@@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/core/sock.c
|
||||
+++ b/net/core/sock.c
|
||||
@@ -4284,6 +4284,8 @@ static __net_initdata struct pernet_oper
|
||||
@@ -4285,6 +4285,8 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
static int __init proto_init(void)
|
||||
{
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.12 = .65
|
||||
LINUX_KERNEL_HASH-6.12.65 = 54e852667af35c0ed06cfc81311e65fa7f5f798a3bfcf78a559d3b4785a139c1
|
||||
LINUX_VERSION-6.12 = .66
|
||||
LINUX_KERNEL_HASH-6.12.66 = ba3897a1c060b05a03cb4dda6f20d8c75e6f73c88b217744823a915056536eaf
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -8656,7 +8656,7 @@ static int nft_register_flowtable_net_ho
|
||||
@@ -8718,7 +8718,7 @@ static int nft_register_flowtable_net_ho
|
||||
err = flowtable->data.type->setup(&flowtable->data,
|
||||
hook->ops.dev,
|
||||
FLOW_BLOCK_BIND);
|
||||
|
||||
@@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @qc: Metadata associated with the taskfile to build
|
||||
@@ -4767,6 +4778,9 @@ void __ata_qc_complete(struct ata_queued
|
||||
@@ -4770,6 +4781,9 @@ void __ata_qc_complete(struct ata_queued
|
||||
link->active_tag = ATA_TAG_POISON;
|
||||
ap->nr_active_links--;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
/* clear exclusive status */
|
||||
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
|
||||
@@ -5489,6 +5503,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -5492,6 +5506,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@@ -83,7 +83,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
ata_force_pflags(ap);
|
||||
@@ -5505,6 +5522,12 @@ void ata_port_free(struct ata_port *ap)
|
||||
@@ -5508,6 +5525,12 @@ void ata_port_free(struct ata_port *ap)
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
ida_free(&ata_ida, ap->print_id);
|
||||
@@ -96,7 +96,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ata_port_free);
|
||||
@@ -5909,7 +5932,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -5912,7 +5935,23 @@ int ata_host_register(struct ata_host *h
|
||||
WARN_ON(1);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user