diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-23 18:06:11 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-23 18:06:11 +0000 |
| commit | 2d379e796f27e7ab4bbc3d5406776722ecba379b (patch) | |
| tree | 65aa809ad1c4083c2b4a663c29034ebffe1449d0 /target/linux/oxnas | |
| parent | 2190f090bb8bd1a575cc3534cb799e14841cb3f1 (diff) | |
| download | upstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.gz upstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.bz2 upstream-2d379e796f27e7ab4bbc3d5406776722ecba379b.zip | |
kernel: update 4.1 to 4.1.6
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46713
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.1/999-libata-hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch index c298f7561e..3d9ec115f6 100644 --- a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4781,6 +4789,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4796,6 +4804,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -4826,6 +4837,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4841,6 +4852,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -902,6 +902,8 @@ struct ata_port_operations { +@@ -905,6 +905,8 @@ struct ata_port_operations { void (*qc_prep)(struct ata_queued_cmd *qc); unsigned int (*qc_issue)(struct ata_queued_cmd *qc); bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -992,6 +994,9 @@ struct ata_port_operations { +@@ -995,6 +997,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |