diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-04-03 20:25:20 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-14 14:52:49 +0200 |
| commit | a9b6077402730537ef19dd95b3583d6aeb3e3fbd (patch) | |
| tree | 7b642983e36bb4d2d08f0549986f962a051447ec /target/linux/oxnas | |
| parent | 09d95e44fc3d1a9f900b7305b10dc241a12d6f37 (diff) | |
| download | upstream-a9b6077402730537ef19dd95b3583d6aeb3e3fbd.tar.gz upstream-a9b6077402730537ef19dd95b3583d6aeb3e3fbd.tar.bz2 upstream-a9b6077402730537ef19dd95b3583d6aeb3e3fbd.zip | |
kernel: bump kernel 4.4 to 4.4.126 for 17.01
* Refreshed patches
Compile-tested: ar71xx, ramips/mt7621, x86/64
Run-tested: ar71xx
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch | 2 | ||||
| -rw-r--r-- | target/linux/oxnas/patches-4.4/999-libata-hacks.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch b/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch index 2a98c39a21..45c4bc70bb 100644 --- a/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch +++ b/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch @@ -75,7 +75,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand; --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c -@@ -1073,8 +1073,7 @@ static int fsl_ifc_nand_probe(struct pla +@@ -1074,8 +1074,7 @@ static int fsl_ifc_nand_probe(struct pla ifc_nand_ctrl->addr = NULL; fsl_ifc_ctrl_dev->nand = ifc_nand_ctrl; diff --git a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch index ac278ab234..faf33b704f 100644 --- a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4788,6 +4796,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4809,6 +4817,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); -@@ -4833,6 +4844,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4854,6 +4865,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); |