Bump kernel up to 4.4.145 and fix usb.ids hash

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1b5f987b2c56b930b0238014c3d954a842dce23e..2d571d73cb66df35777ffd31bdd9fc72d1847869 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,9 +2,9 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-4.4 = .138
+LINUX_VERSION-4.4 = .145
 
-LINUX_KERNEL_HASH-4.4.138 = 546f14592bf9ef7a680b280fa1ff56c05467dd34195a4d51af9808fb8aca6080
+LINUX_KERNEL_HASH-4.4.145 = 77d14cbc635bd5eca796d2444b89dd98a525c1b851ddd123490139c3566414b1
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index 00d177885c7b3b506be5bc89bb1d2bea535b063a..0760ff8ee979c24aa500cbbc96e76e893cc37d19 100644 (file)
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -38,7 +38,7 @@ define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
   URL_FILE:=usb.ids
   URL:=$(PROJECT_GIT)/hwids/raw/ae25707c751fff79148328229a76fc44232abeae/usb.ids
-  HASH:=6a575d07a71cb7f7f72480fb0286d812d180404f45b00b68334f5ababf190b87
+  HASH:=970b720d56beec35b7ef8bda02e8b85ab853b436f3cae4fed13b808e1a79fdd8
 endef
 $(eval $(call Download,usb_ids))
 

diff --git a/target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch b/target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch
deleted file mode 100644 (file)
index 64fb545..0000000
--- a/target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 18 May 2016 18:03:31 +0200
-Subject: [PATCH] MIPS: ath79: fix register address in ath79_ddr_wb_flush()
-
-ath79_ddr_wb_flush_base has the type void __iomem *, so register offsets
-need to be a multiple of 4.
-
-Cc: Alban Bedel <albeu@free.fr>
-Fixes: 24b0e3e84fbf ("MIPS: ath79: Improve the DDR controller interface")
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/arch/mips/ath79/common.c
-+++ b/arch/mips/ath79/common.c
-@@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init);
- 
- void ath79_ddr_wb_flush(u32 reg)
- {
--      void __iomem *flush_reg = ath79_ddr_wb_flush_base + reg;
-+      void __iomem *flush_reg = ath79_ddr_wb_flush_base + reg * 4;
- 
-       /* Flush the DDR write buffer. */
-       __raw_writel(0x1, flush_reg);

diff --git a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644 (file)
index 1ccce4e..0000000
--- a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1632,8 +1632,8 @@ static int __xipram do_write_oneword(str
-                       break;
-               }
- 
--              if (chip_ready(map, adr))
--                      break;
-+              if (chip_good(map, adr, datum))
-+                      goto enable_xip;
- 
-               /* Latency issues. Drop the lock, wait a while and retry */
-               UDELAY(map, chip, adr, 1);
-@@ -1649,6 +1649,8 @@ static int __xipram do_write_oneword(str
- 
-               ret = -EIO;
-       }
-+
-+ enable_xip:
-       xip_enable(map, chip, adr);
-  op_done:
-       if (mode == FL_OTP_WRITE)
-@@ -2227,7 +2229,6 @@ static int cfi_amdstd_panic_write(struct
-       return 0;
- }
- 
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct
-                       chip->erase_suspended = 0;
-               }
- 
--              if (chip_ready(map, adr))
--                      break;
-+              if (chip_good(map, adr, map_word_ff(map)))
-+                      goto op_done;
- 
-               if (time_after(jiffies, timeo)) {
-                       printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct
-               ret = -EIO;
-       }
- 
-+ op_done:
-       chip->state = FL_READY;
-       xip_enable(map, chip, adr);
-       DISABLE_VPP(map);
-@@ -2380,9 +2382,9 @@ static int __xipram do_erase_oneblock(st
-                       chip->erase_suspended = 0;
-               }
- 
--              if (chip_ready(map, adr)) {
-+              if (chip_good(map, adr, map_word_ff(map))) {
-                       xip_enable(map, chip, adr);
--                      break;
-+                      goto op_done;
-               }
- 
-               if (time_after(jiffies, timeo)) {
-@@ -2404,6 +2406,7 @@ static int __xipram do_erase_oneblock(st
-               ret = -EIO;
-       }
- 
-+ op_done:
-       chip->state = FL_READY;
-       DISABLE_VPP(map);
-       put_chip(map, chip, adr);

diff --git a/target/linux/generic/patches-4.4/999-fix_upstream_ipv6_bug.patch b/target/linux/generic/patches-4.4/999-fix_upstream_ipv6_bug.patch
deleted file mode 100644 (file)
index c1bac43..0000000
--- a/target/linux/generic/patches-4.4/999-fix_upstream_ipv6_bug.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/net/ipv6/sit.c
-+++ b/net/ipv6/sit.c
-@@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb
- 
-               if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6)))
-                       goto out;
--              iph = ip_hdr(skb);
- 
-               err = IP_ECN_decapsulate(iph, skb);
-               if (unlikely(err)) {