kernel: Update to version 4.4.184

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index adaf24e714bec051b6d87d14418962f6894b9c73..731b7b4ca1f2ff5f964a4b0d854d0fc21a85b76e 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .43
-LINUX_VERSION-4.4 = .182
+LINUX_VERSION-4.4 = .184
 
 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
-LINUX_KERNEL_HASH-4.4.182 = c409d88f61cd9a37cbba36d5d9c8162263eb1e5c9380efaf880a3ec10cd88527
+LINUX_KERNEL_HASH-4.4.184 = 6543232fc082485c1088830b9456e1a6e511239e4bf98817b0166ee62cafc3ca
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

diff --git a/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch b/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch
index 2459dd32214ae1f87557dbfb1805134b46e5bf20..2b4452b7de44434a4e3d6b9c53758852766fb6b1 100644 (file)
--- a/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch
+++ b/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch
@@ -240,7 +240,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
  #define PPC4XX_SEC_VERSION_STR                        "0.5"
  
-@@ -1230,6 +1231,7 @@ static int crypto4xx_probe(struct platfo
+@@ -1221,6 +1222,7 @@ static int crypto4xx_probe(struct platfo
        if (rc)
                goto err_start_dev;
  
@@ -248,7 +248,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        return 0;
  
  err_start_dev:
-@@ -1256,6 +1258,8 @@ static int crypto4xx_remove(struct platf
+@@ -1247,6 +1249,8 @@ static int crypto4xx_remove(struct platf
        struct device *dev = &ofdev->dev;
        struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev);
  
@@ -257,7 +257,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        free_irq(core_dev->irq, dev);
        irq_dispose_mapping(core_dev->irq);
  
-@@ -1276,7 +1280,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match)
+@@ -1267,7 +1271,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match)
  
  static struct platform_driver crypto4xx_driver = {
        .driver = {
@@ -266,7 +266,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                .of_match_table = crypto4xx_match,
        },
        .probe          = crypto4xx_probe,
-@@ -1288,4 +1292,3 @@ module_platform_driver(crypto4xx_driver)
+@@ -1279,4 +1283,3 @@ module_platform_driver(crypto4xx_driver)
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("James Hsiao <jhsiao@amcc.com>");
  MODULE_DESCRIPTION("Driver for AMCC PPC4xx crypto accelerator");

diff --git a/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch b/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch
deleted file mode 100644 (file)
index 428b416..0000000
--- a/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8d9f1b2c4ad8b86c4a5af5e4787ea4eae7853f6d Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Thu, 20 Jun 2019 11:29:15 +0200
-Subject: Revert "crypto: crypto4xx - properly set IV after de- and encrypt"
-
-This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584.
-
-This fixes a compile problem in upstream kernel 4.4.
----
- drivers/crypto/amcc/crypto4xx_alg.c  | 3 +--
- drivers/crypto/amcc/crypto4xx_core.c | 9 ---------
- 2 files changed, 1 insertion(+), 11 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_alg.c
-+++ b/drivers/crypto/amcc/crypto4xx_alg.c
-@@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct c
-       sa = (struct dynamic_sa_ctl *) ctx->sa_in;
-       ctx->hash_final = 0;
- 
--      set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
--                               SA_SAVE_IV : SA_NOT_SAVE_IV),
-+      set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
-                                SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
-                                SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,
-                                SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,
---- a/drivers/crypto/amcc/crypto4xx_core.c
-+++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -646,15 +646,6 @@ static u32 crypto4xx_ablkcipher_done(str
-               addr = dma_map_page(dev->core_dev->device, sg_page(dst),
-                                   dst->offset, dst->length, DMA_FROM_DEVICE);
-       }
--
--      if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {
--              struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
--
--              crypto4xx_memcpy_from_le32((u32 *)req->iv,
--                      pd_uinfo->sr_va->save_iv,
--                      crypto_skcipher_ivsize(skcipher));
--      }
--
-       crypto4xx_ret_sg_desc(dev, pd_uinfo);
-       if (ablk_req->base.complete != NULL)
-               ablk_req->base.complete(&ablk_req->base, 0);

diff --git a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
index 2adcfef309b2b1b74759f72289e511f670ea8cc7..af3108d4b936b47675e47b3ebcb55efbe0723ec5 100644 (file)
--- a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
+++ b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
@@ -47,7 +47,7 @@ Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
  #include <linux/pm_runtime.h>
  #include <linux/platform_device.h>
  
-@@ -4946,6 +4947,9 @@ void ata_qc_complete(struct ata_queued_c
+@@ -4949,6 +4950,9 @@ void ata_qc_complete(struct ata_queued_c
  {
        struct ata_port *ap = qc->ap;
  

diff --git a/target/linux/ar71xx/patches-4.4/450-gpio-nxp-74hc153-gpio-chip-driver.patch b/target/linux/ar71xx/patches-4.4/450-gpio-nxp-74hc153-gpio-chip-driver.patch
index 8bccd12fac708dad4838887988e50a2adf69fb32..c3667a5e04a3b6568ffea7adaff9b441910abf4d 100644 (file)
--- a/target/linux/ar71xx/patches-4.4/450-gpio-nxp-74hc153-gpio-chip-driver.patch
+++ b/target/linux/ar71xx/patches-4.4/450-gpio-nxp-74hc153-gpio-chip-driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1040,4 +1040,12 @@ config GPIO_VIPERBOARD
+@@ -1041,4 +1041,12 @@ config GPIO_VIPERBOARD
  
  endmenu
  

diff --git a/target/linux/ar71xx/patches-4.4/451-gpio-74x164-improve-platform-device-support.patch b/target/linux/ar71xx/patches-4.4/451-gpio-74x164-improve-platform-device-support.patch
index 0f7faf280f6627742403989e6666be4c7cde9a81..b2c54c6df91029ab1c484dd0c78f588f57902ba2 100644 (file)
--- a/target/linux/ar71xx/patches-4.4/451-gpio-74x164-improve-platform-device-support.patch
+++ b/target/linux/ar71xx/patches-4.4/451-gpio-74x164-improve-platform-device-support.patch
@@ -99,7 +99,7 @@
 +#endif
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -991,7 +991,6 @@ menu "SPI GPIO expanders"
+@@ -992,7 +992,6 @@ menu "SPI GPIO expanders"
  
  config GPIO_74X164
        tristate "74x164 serial-in/parallel-out 8-bits shift register"

diff --git a/target/linux/ar71xx/patches-4.4/452-gpio-add-gpio-latch-driver.patch b/target/linux/ar71xx/patches-4.4/452-gpio-add-gpio-latch-driver.patch
index c545252b38df6361f2090d015cd72152f632275e..520612396e355db62d0bf31e2265bd5ed4785a68 100644 (file)
--- a/target/linux/ar71xx/patches-4.4/452-gpio-add-gpio-latch-driver.patch
+++ b/target/linux/ar71xx/patches-4.4/452-gpio-add-gpio-latch-driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1047,4 +1047,9 @@ config GPIO_NXP_74HC153
+@@ -1048,4 +1048,9 @@ config GPIO_NXP_74HC153
          Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
          provides a GPIO interface supporting input mode only.
  

diff --git a/target/linux/brcm2708/patches-4.4/0177-configfs-implement-binary-attributes.patch b/target/linux/brcm2708/patches-4.4/0177-configfs-implement-binary-attributes.patch
index 26a766af6f52aac18958806fcbf4d5ccb9cfbf69..5297e43dfcac21745ec887c6d539901c0731a408 100644 (file)
--- a/target/linux/brcm2708/patches-4.4/0177-configfs-implement-binary-attributes.patch
+++ b/target/linux/brcm2708/patches-4.4/0177-configfs-implement-binary-attributes.patch
@@ -164,7 +164,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
        struct config_item * item = NULL;
 --- a/fs/configfs/dir.c
 +++ b/fs/configfs/dir.c
-@@ -255,6 +255,12 @@ static void configfs_init_file(struct in
+@@ -253,6 +253,12 @@ static void configfs_init_file(struct in
        inode->i_fop = &configfs_file_operations;
  }
  
@@ -177,7 +177,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
  static void init_symlink(struct inode * inode)
  {
        inode->i_op = &configfs_symlink_inode_operations;
-@@ -423,7 +429,9 @@ static int configfs_attach_attr(struct c
+@@ -421,7 +427,9 @@ static int configfs_attach_attr(struct c
        spin_unlock(&configfs_dirent_lock);
  
        error = configfs_create(dentry, (attr->ca_mode & S_IALLUGO) | S_IFREG,
@@ -188,7 +188,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
        if (error) {
                configfs_put(sd);
                return error;
-@@ -583,6 +591,7 @@ static int populate_attrs(struct config_
+@@ -581,6 +589,7 @@ static int populate_attrs(struct config_
  {
        struct config_item_type *t = item->ci_type;
        struct configfs_attribute *attr;
@@ -196,7 +196,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
        int error = 0;
        int i;
  
-@@ -594,6 +603,13 @@ static int populate_attrs(struct config_
+@@ -592,6 +601,13 @@ static int populate_attrs(struct config_
                                break;
                }
        }

diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
index 4b851072a80dc6e7491091a26715768a5eb350f8..ca05db312585e8d94e490ced91d3299455b8fe38 100644 (file)
--- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
@@ -69,7 +69,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
-@@ -4812,6 +4825,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4815,6 +4828,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
                if (tag < 0)
                        return NULL;
        }
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
        qc = __ata_qc_from_tag(ap, tag);
        qc->tag = tag;
-@@ -5708,6 +5724,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5711,6 +5727,9 @@ struct ata_port *ata_port_alloc(struct a
        ap->stats.unhandled_irq = 1;
        ap->stats.idle_irq = 1;
  #endif
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        ata_sff_port_init(ap);
  
        return ap;
-@@ -5729,6 +5748,12 @@ static void ata_host_release(struct devi
+@@ -5732,6 +5751,12 @@ static void ata_host_release(struct devi
  
                kfree(ap->pmp_link);
                kfree(ap->slave_link);
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                kfree(ap);
                host->ports[i] = NULL;
        }
-@@ -6175,7 +6200,23 @@ int ata_host_register(struct ata_host *h
+@@ -6178,7 +6203,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;
        }

diff --git a/target/linux/ixp4xx/patches-4.4/020-gateworks_i2c_pld.patch b/target/linux/ixp4xx/patches-4.4/020-gateworks_i2c_pld.patch
index c527db8ed13857845f50b5561d2a368b3e0747e3..552c71024dbc7be563c7e7976e86a99a8a0c9cbf 100644 (file)
--- a/target/linux/ixp4xx/patches-4.4/020-gateworks_i2c_pld.patch
+++ b/target/linux/ixp4xx/patches-4.4/020-gateworks_i2c_pld.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -697,6 +697,14 @@ config GPIO_SX150X
+@@ -698,6 +698,14 @@ config GPIO_SX150X
          8 bits:  sx1508q
          16 bits: sx1509q
  

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 a65582ee001e36d2df44bc930cb04feba6604d50..6a35acc2fae93321be86ea8c5eb97aa8b2f14a87 100644 (file)
--- 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
-@@ -4819,6 +4827,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4822,6 +4830,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);
-@@ -4864,6 +4875,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4867,6 +4878,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);