kernel: update 4.0 to 4.0.5

Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46063

45 files changed, 160 insertions, 386 deletions

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1be48e7551..74d293b57f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .16
-LINUX_VERSION-4.0 = .4
+LINUX_VERSION-4.0 = .5
 
 LINUX_KERNEL_MD5SUM-3.18.16 = 3b0e66fdf47b0660521d79b881eabf04
-LINUX_KERNEL_MD5SUM-4.0.4 = 71d8b666438e6b59f103e9384889c15a
+LINUX_KERNEL_MD5SUM-4.0.5 = 214836ae60a5674c31bb7cede5f47794
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch b/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch
index 095338f61d..e78b159e6f 100644
--- a/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch
@@ -17,11 +17,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/sprom.c | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 2eff7fe..eff9205 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -836,6 +836,38 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
+@@ -836,6 +836,38 @@ static int bcm47xx_get_sprom_ssb(struct
  #endif
  
  #if defined(CONFIG_BCM47XX_BCMA)
@@ -60,7 +58,7 @@ index 2eff7fe..eff9205 100644
  static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
  {
  	char prefix[10];
-@@ -847,6 +879,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
+@@ -847,6 +879,7 @@ static int bcm47xx_get_sprom_bcma(struct
  		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
  			 bus->host_pci->bus->number + 1,
  			 PCI_SLOT(bus->host_pci->devfn));
@@ -68,6 +66,3 @@ index 2eff7fe..eff9205 100644
  		bcm47xx_fill_sprom(out, prefix, false);
  		return 0;
  	case BCMA_HOSTTYPE_SOC:
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch b/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
index a028d9d67e..9c9865ff83 100644
--- a/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
@@ -18,11 +18,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index c5c381c..5e4ae04 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -91,7 +91,6 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
+@@ -91,7 +91,6 @@ static int nvram_find_and_copy(void __io
  	return -ENXIO;
  
  found:
@@ -51,6 +49,3 @@ index c5c381c..5e4ae04 100644
  
  			return 0;
  		}
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch b/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
index 7b16835ae9..ee2e2732ff 100644
--- a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
@@ -16,8 +16,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 5e4ae04..d805d8a 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -175,7 +175,7 @@ static int nvram_init(void)
@@ -29,7 +27,7 @@ index 5e4ae04..d805d8a 100644
  
  	if (!name)
  		return -EINVAL;
-@@ -191,7 +191,9 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -191,7 +191,9 @@ int bcm47xx_nvram_getenv(const char *nam
  	end = nvram_buf + sizeof(nvram_buf) - 2;
  	end[0] = end[1] = '\0';
  	for (; *var; var = value + strlen(value) + 1) {
@@ -40,6 +38,3 @@ index 5e4ae04..d805d8a 100644
  		if (!eq)
  			break;
  		value = eq + 1;
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch b/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
index d073a06d32..c1c0927cec 100644
--- a/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
@@ -39,8 +39,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  delete mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
  create mode 100644 include/linux/bcm47xx_nvram.h
 
-diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
-index b3ae068..6e85130 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
 @@ -1,8 +1,8 @@
@@ -53,8 +51,6 @@ index b3ae068..6e85130 100644
  
  struct bcm47xx_board_type {
  	const enum bcm47xx_board board;
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index d805d8a..7c77a88 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -16,7 +16,7 @@
@@ -66,8 +62,6 @@ index d805d8a..7c77a88 100644
  
  #define NVRAM_MAGIC		0x48534C46	/* 'FLSH' */
  #define NVRAM_SPACE		0x8000
-diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
-index e43b504..b26c9c2 100644
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 @@ -42,7 +42,6 @@
@@ -78,8 +72,6 @@ index e43b504..b26c9c2 100644
  #include <bcm47xx_board.h>
  
  union bcm47xx_bus bcm47xx_bus;
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index eff9205..c114b02 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
 @@ -27,7 +27,6 @@
@@ -90,8 +82,6 @@ index eff9205..c114b02 100644
  #include <linux/if_ether.h>
  #include <linux/etherdevice.h>
  
-diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c
-index 2c85d92..5b46510 100644
 --- a/arch/mips/bcm47xx/time.c
 +++ b/arch/mips/bcm47xx/time.c
 @@ -27,7 +27,6 @@
@@ -102,8 +92,6 @@ index 2c85d92..5b46510 100644
  #include <bcm47xx_board.h>
  
  void __init plat_time_init(void)
-diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-index 7527c1d..8ed77f6 100644
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
 @@ -22,6 +22,7 @@
@@ -139,8 +127,6 @@ index 7527c1d..8ed77f6 100644
 -
 -#endif /* __BCM47XX_NVRAM_H */
 +#include <linux/bcm47xx_nvram.h>
-diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
-index 04faf6d..24424f3 100644
 --- a/drivers/bcma/driver_mips.c
 +++ b/drivers/bcma/driver_mips.c
 @@ -21,7 +21,7 @@
@@ -152,11 +138,9 @@ index 04faf6d..24424f3 100644
  #endif
  
  enum bcma_boot_dev {
-diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
-index bd5916a..77363d6 100644
 --- a/drivers/net/ethernet/broadcom/b44.c
 +++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
+@@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44
  }
  
  #ifdef CONFIG_BCM47XX
@@ -165,8 +149,6 @@ index bd5916a..77363d6 100644
  static void b44_wap54g10_workaround(struct b44 *bp)
  {
  	char buf[20];
-diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
-index 0469f72..be059df 100644
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
 @@ -18,7 +18,7 @@
@@ -178,8 +160,6 @@ index 0469f72..be059df 100644
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
  	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
-diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
-index 1173a09..0942841 100644
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
 @@ -14,7 +14,7 @@
@@ -191,8 +171,6 @@ index 1173a09..0942841 100644
  #endif
  
  #include "ssb_private.h"
-diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
-index 7b986f9..f87efef 100644
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
 @@ -16,7 +16,7 @@
@@ -204,9 +182,6 @@ index 7b986f9..f87efef 100644
  #endif
  
  #include "ssb_private.h"
-diff --git a/include/linux/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h
-new file mode 100644
-index 0000000..b12b07e
 --- /dev/null
 +++ b/include/linux/bcm47xx_nvram.h
 @@ -0,0 +1,34 @@
@@ -244,6 +219,3 @@ index 0000000..b12b07e
 +#endif
 +
 +#endif /* __BCM47XX_NVRAM_H */
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch b/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch
index 0e93447e30..826307b325 100644
--- a/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch
@@ -25,8 +25,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/time.c            |  1 -
  8 files changed, 34 insertions(+), 30 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
-index ea909a5..41796be 100644
 --- a/arch/mips/bcm47xx/bcm47xx_private.h
 +++ b/arch/mips/bcm47xx/bcm47xx_private.h
 @@ -1,6 +1,10 @@
@@ -40,8 +38,6 @@ index ea909a5..41796be 100644
  #include <linux/kernel.h>
  
  /* prom.c */
-diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
-index 6e85130..d4a5a51 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
 @@ -330,9 +330,8 @@ void __init bcm47xx_board_detect(void)
@@ -55,8 +51,6 @@ index 6e85130..d4a5a51 100644
  
  	board_detected = bcm47xx_board_get_nvram();
  	bcm47xx_board.board = board_detected->board;
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 7c77a88..6a97732 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -18,8 +18,10 @@
@@ -83,7 +77,7 @@ index 7c77a88..6a97732 100644
  	for (i = 0; i < sizeof(struct nvram_header); i += 4)
  		*dst++ = __raw_readl(src++);
  	for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
-@@ -189,7 +191,8 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -189,7 +191,8 @@ int bcm47xx_nvram_getenv(const char *nam
  	/* Look for name=value and return value */
  	var = &nvram_buf[sizeof(struct nvram_header)];
  	end = nvram_buf + sizeof(nvram_buf) - 2;
@@ -93,7 +87,7 @@ index 7c77a88..6a97732 100644
  	for (; *var; var = value + strlen(value) + 1) {
  		data_left = end - var;
  
-@@ -197,11 +200,10 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -197,11 +200,10 @@ int bcm47xx_nvram_getenv(const char *nam
  		if (!eq)
  			break;
  		value = eq + 1;
@@ -122,8 +116,6 @@ index 7c77a88..6a97732 100644
  		err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);
  		if (err <= 0)
  			continue;
-diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
-index 1b170bf..ab698ba 100644
 --- a/arch/mips/bcm47xx/prom.c
 +++ b/arch/mips/bcm47xx/prom.c
 @@ -35,7 +35,6 @@
@@ -143,11 +135,9 @@ index 1b170bf..ab698ba 100644
  			break;
  		}
  		if (!memcmp(prom_init, prom_init + mem, 32))
-diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
-index 2f5bbd6..df761d3 100644
 --- a/arch/mips/bcm47xx/serial.c
 +++ b/arch/mips/bcm47xx/serial.c
-@@ -36,8 +36,8 @@ static int __init uart8250_init_ssb(void)
+@@ -36,8 +36,8 @@ static int __init uart8250_init_ssb(void
  		struct plat_serial8250_port *p = &(uart8250_data[i]);
  		struct ssb_serial_port *ssb_port = &(mcore->serial_ports[i]);
  
@@ -158,7 +148,7 @@ index 2f5bbd6..df761d3 100644
  		p->irq = ssb_port->irq + 2;
  		p->uartclk = ssb_port->baud_base;
  		p->regshift = ssb_port->reg_shift;
-@@ -62,8 +62,8 @@ static int __init uart8250_init_bcma(void)
+@@ -62,8 +62,8 @@ static int __init uart8250_init_bcma(voi
  		struct bcma_serial_port *bcma_port;
  		bcma_port = &(cc->serial_ports[i]);
  
@@ -169,8 +159,6 @@ index 2f5bbd6..df761d3 100644
  		p->irq = bcma_port->irq;
  		p->uartclk = bcma_port->baud_base;
  		p->regshift = bcma_port->reg_shift;
-diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
-index b26c9c2..82ff9fd 100644
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 @@ -52,7 +52,7 @@ EXPORT_SYMBOL(bcm47xx_bus_type);
@@ -182,7 +170,7 @@ index b26c9c2..82ff9fd 100644
  	local_irq_disable();
  	/* Set the watchdog timer to reset immediately */
  	switch (bcm47xx_bus_type) {
-@@ -107,7 +107,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
+@@ -107,7 +107,7 @@ static int bcm47xx_get_invariants(struct
  	char buf[20];
  
  	/* Fill boardinfo structure */
@@ -191,7 +179,7 @@ index b26c9c2..82ff9fd 100644
  
  	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
  
-@@ -126,7 +126,7 @@ static void __init bcm47xx_register_ssb(void)
+@@ -126,7 +126,7 @@ static void __init bcm47xx_register_ssb(
  	char buf[100];
  	struct ssb_mipscore *mcore;
  
@@ -200,7 +188,7 @@ index b26c9c2..82ff9fd 100644
  				      bcm47xx_get_invariants);
  	if (err)
  		panic("Failed to initialize SSB bus (err %d)", err);
-@@ -136,7 +136,7 @@ static void __init bcm47xx_register_ssb(void)
+@@ -136,7 +136,7 @@ static void __init bcm47xx_register_ssb(
  		if (strstr(buf, "console=ttyS1")) {
  			struct ssb_serial_port port;
  
@@ -227,11 +215,9 @@ index b26c9c2..82ff9fd 100644
  #ifdef CONFIG_BCM47XX_SSB
  		bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
  		bcm47xx_sprom_register_fallbacks();
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index c114b02..5d32afc 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -780,8 +780,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -780,8 +780,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  		bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
  		break;
  	default:
@@ -242,7 +228,7 @@ index c114b02..5d32afc 100644
  		sprom->revision = 1;
  		bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  		bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-@@ -828,7 +828,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
+@@ -828,7 +828,7 @@ static int bcm47xx_get_sprom_ssb(struct
  		bcm47xx_fill_sprom(out, prefix, false);
  		return 0;
  	} else {
@@ -251,7 +237,7 @@ index c114b02..5d32afc 100644
  		return -EINVAL;
  	}
  }
-@@ -893,7 +893,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
+@@ -893,7 +893,7 @@ static int bcm47xx_get_sprom_bcma(struct
  		}
  		return 0;
  	default:
@@ -260,8 +246,6 @@ index c114b02..5d32afc 100644
  		return -EINVAL;
  	}
  }
-diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c
-index 5b46510..74224cf 100644
 --- a/arch/mips/bcm47xx/time.c
 +++ b/arch/mips/bcm47xx/time.c
 @@ -22,7 +22,6 @@
@@ -272,6 +256,3 @@ index 5b46510..74224cf 100644
  #include <linux/init.h>
  #include <linux/ssb/ssb.h>
  #include <asm/time.h>
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch b/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch
index f7e404f6e3..6f96ee02bd 100644
--- a/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch
@@ -17,8 +17,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 6a97732..2357ea3 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -11,6 +11,7 @@
@@ -29,7 +27,7 @@ index 6a97732..2357ea3 100644
  #include <linux/types.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
-@@ -203,7 +204,7 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -203,7 +204,7 @@ int bcm47xx_nvram_getenv(const char *nam
  		if (eq - var == strlen(name) &&
  		    strncmp(var, name, eq - var) == 0)
  			return snprintf(val, val_len, "%s", value);
@@ -38,6 +36,3 @@ index 6a97732..2357ea3 100644
  	return -ENOENT;
  }
  EXPORT_SYMBOL(bcm47xx_nvram_getenv);
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch b/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch
index af6ec8e891..a7cc1106b8 100644
--- a/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch
@@ -19,8 +19,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 2357ea3..2ac7482 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -20,7 +20,7 @@
@@ -32,6 +30,3 @@ index 2357ea3..2ac7482 100644
  #define NVRAM_MAX_GPIO_ENTRIES		32
  #define NVRAM_MAX_GPIO_VALUE_LEN	30
  
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch b/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
index 50b9f2daca..c40c8b7f89 100644
--- a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
@@ -19,8 +19,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 36 ++++++++++++++----------------------
  1 file changed, 14 insertions(+), 22 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 2ac7482..ba632ff 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -139,36 +139,28 @@ static int nvram_init(void)
@@ -39,28 +37,29 @@ index 2ac7482..ba632ff 100644
 -
 -		if (from < 0)
 -			continue;
--
--		err = mtd_read(mtd, from, sizeof(header), &bytes_read,
--			       (uint8_t *)&header);
--		if (!err && header.magic == NVRAM_MAGIC) {
--			u8 *dst = (uint8_t *)nvram_buf;
--			size_t len = header.len;
 +	err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
 +	if (!err && header.magic == NVRAM_MAGIC) {
 +		u8 *dst = (uint8_t *)nvram_buf;
 +		size_t len = header.len;
- 
--			if (header.len > NVRAM_SPACE) {
--				pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
--				       header.len, NVRAM_SPACE);
--				len = NVRAM_SPACE;
--			}
++
 +		if (header.len > NVRAM_SPACE) {
 +			pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
 +				header.len, NVRAM_SPACE);
 +			len = NVRAM_SPACE;
 +		}
  
+-		err = mtd_read(mtd, from, sizeof(header), &bytes_read,
+-			       (uint8_t *)&header);
+-		if (!err && header.magic == NVRAM_MAGIC) {
+-			u8 *dst = (uint8_t *)nvram_buf;
+-			size_t len = header.len;
+-
+-			if (header.len > NVRAM_SPACE) {
+-				pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+-				       header.len, NVRAM_SPACE);
+-				len = NVRAM_SPACE;
+-			}
+-
 -			err = mtd_read(mtd, from, len, &bytes_read, dst);
 -			if (err)
 -				return err;
@@ -74,6 +73,3 @@ index 2ac7482..ba632ff 100644
  	}
  #endif
  
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch b/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch
index 1f7233b807..89188117ac 100644
--- a/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch
@@ -16,11 +16,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/board.c | 48 ++++++++++++++++++++---------------------------
  1 file changed, 20 insertions(+), 28 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
-index d4a5a51..f936dcc 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
-@@ -40,20 +40,6 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_model_name[] __initconst = {
+@@ -40,20 +40,6 @@ struct bcm47xx_board_type_list1 bcm47xx_
  	{ {0}, NULL},
  };
  
@@ -41,7 +39,7 @@ index d4a5a51..f936dcc 100644
  /* hardware_version */
  static const
  struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
-@@ -202,6 +188,18 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_board_type_rev[] __initconst
+@@ -202,6 +188,18 @@ struct bcm47xx_board_type_list2 bcm47xx_
  	{ {0}, NULL},
  };
  
@@ -60,7 +58,7 @@ index d4a5a51..f936dcc 100644
  static const
  struct bcm47xx_board_type bcm47xx_board_unknown[] __initconst = {
  	{BCM47XX_BOARD_UNKNOWN, "Unknown Board"},
-@@ -225,20 +223,6 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
+@@ -225,20 +223,6 @@ static __init const struct bcm47xx_board
  		}
  	}
  
@@ -81,7 +79,7 @@ index d4a5a51..f936dcc 100644
  	if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
  		for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
  			if (strstarts(buf1, e1->value1))
-@@ -314,6 +298,14 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
+@@ -314,6 +298,14 @@ static __init const struct bcm47xx_board
  				return &e2->board;
  		}
  	}
@@ -96,6 +94,3 @@ index d4a5a51..f936dcc 100644
  	return bcm47xx_board_unknown;
  }
  
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch b/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch
index e81a99f7c3..6e6166cad2 100644
--- a/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch
@@ -18,8 +18,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |  4 ++++
  4 files changed, 36 insertions(+)
 
-diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
-index f936dcc..41b9736 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
 @@ -151,9 +151,11 @@ static const
@@ -34,7 +32,7 @@ index f936dcc..41b9736 100644
  	{{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
-@@ -196,6 +198,8 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_board_type_rev[] __initconst
+@@ -196,6 +198,8 @@ struct bcm47xx_board_type_list2 bcm47xx_
  static const
  struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
  	{{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
@@ -43,11 +41,9 @@ index f936dcc..41b9736 100644
  	{{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
  	{ {0}, NULL},
  };
-diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
-index 913182b..276276a 100644
 --- a/arch/mips/bcm47xx/buttons.c
 +++ b/arch/mips/bcm47xx/buttons.c
-@@ -252,6 +252,12 @@ bcm47xx_buttons_linksys_wrt160nv3[] __initconst = {
+@@ -252,6 +252,12 @@ bcm47xx_buttons_linksys_wrt160nv3[] __in
  };
  
  static const struct gpio_keys_button
@@ -60,7 +56,7 @@ index 913182b..276276a 100644
  bcm47xx_buttons_linksys_wrt300nv11[] __initconst = {
  	BCM47XX_GPIO_KEY(4, KEY_UNKNOWN),
  	BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -327,6 +333,12 @@ bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
+@@ -327,6 +333,12 @@ bcm47xx_buttons_netgear_wndr3400v1[] __i
  };
  
  static const struct gpio_keys_button
@@ -73,7 +69,7 @@ index 913182b..276276a 100644
  bcm47xx_buttons_netgear_wndr3700v3[] __initconst = {
  	BCM47XX_GPIO_KEY(2, KEY_RFKILL),
  	BCM47XX_GPIO_KEY(3, KEY_RESTART),
-@@ -516,6 +528,9 @@ int __init bcm47xx_buttons_register(void)
+@@ -516,6 +528,9 @@ int __init bcm47xx_buttons_register(void
  	case BCM47XX_BOARD_LINKSYS_WRT160NV3:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt160nv3);
  		break;
@@ -83,7 +79,7 @@ index 913182b..276276a 100644
  	case BCM47XX_BOARD_LINKSYS_WRT300NV11:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300nv11);
  		break;
-@@ -557,6 +572,9 @@ int __init bcm47xx_buttons_register(void)
+@@ -557,6 +572,9 @@ int __init bcm47xx_buttons_register(void
  	case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
  		break;
@@ -93,11 +89,9 @@ index 913182b..276276a 100644
  	case BCM47XX_BOARD_NETGEAR_WNDR3700V3:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3700v3);
  		break;
-diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
-index 903a656..0e4ade3 100644
 --- a/arch/mips/bcm47xx/leds.c
 +++ b/arch/mips/bcm47xx/leds.c
-@@ -292,6 +292,13 @@ bcm47xx_leds_linksys_wrt160nv3[] __initconst = {
+@@ -292,6 +292,13 @@ bcm47xx_leds_linksys_wrt160nv3[] __initc
  };
  
  static const struct gpio_led
@@ -121,8 +115,6 @@ index 903a656..0e4ade3 100644
  	case BCM47XX_BOARD_LINKSYS_WRT300NV11:
  		bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300nv11);
  		break;
-diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-index 1f5643b..c41d1dc 100644
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 @@ -67,6 +67,7 @@ enum bcm47xx_board {
@@ -153,6 +145,3 @@ index 1f5643b..c41d1dc 100644
  	BCM47XX_BOARD_NETGEAR_WNDR3400VCNA,
  	BCM47XX_BOARD_NETGEAR_WNDR3700V3,
  	BCM47XX_BOARD_NETGEAR_WNDR4000,
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch b/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch
index eb994facff..482aa49a15 100644
--- a/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch
@@ -23,11 +23,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/sprom.c | 32 +++++++++++++++++++++++++++++---
  1 file changed, 29 insertions(+), 3 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 5d32afc..77790c9 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -180,6 +180,33 @@ static void nvram_read_alpha2(const char *prefix, const char *name,
+@@ -180,6 +180,33 @@ static void nvram_read_alpha2(const char
  	memcpy(val, buf, 2);
  }
  
@@ -61,7 +59,7 @@ index 5d32afc..77790c9 100644
  static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
  					const char *prefix, bool fallback)
  {
-@@ -714,9 +741,6 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
+@@ -714,9 +741,6 @@ static void bcm47xx_fill_sprom_ethernet(
  static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
  				    bool fallback)
  {
@@ -71,7 +69,7 @@ index 5d32afc..77790c9 100644
  	nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
  	nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
  			 &sprom->boardflags_hi, fallback);
-@@ -787,6 +811,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -787,6 +811,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  		bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
  		bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
  	}
@@ -80,6 +78,3 @@ index 5d32afc..77790c9 100644
  }
  
  #ifdef CONFIG_BCM47XX_SSB
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch b/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch
index 6056bdf71b..6a2d64f7f8 100644
--- a/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch
@@ -27,22 +27,19 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/sprom.c | 605 ++++++++++++++++------------------------------
  1 file changed, 204 insertions(+), 401 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 77790c9..68ebf23 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -201,9 +201,211 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
+@@ -201,9 +201,211 @@ static void bcm47xx_sprom_fill_auto(stru
  	bool fb = fallback;
  
  	ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
 +	ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb);
 +	ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true);
  	ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
--
--	/* TODO: Move more mappings here */
 +	ENTRY(0x00000002, u8, pre, "cc", country_code, 0, fb);
 +	ENTRY(0xfffffff8, u8, pre, "regrev", regrev, 0, fb);
-+
+ 
+-	/* TODO: Move more mappings here */
 +	ENTRY(0xfffffffe, u8, pre, "ledbh0", gpio0, 0xff, fb);
 +	ENTRY(0xfffffffe, u8, pre, "ledbh1", gpio1, 0xff, fb);
 +	ENTRY(0xfffffffe, u8, pre, "ledbh2", gpio2, 0xff, fb);
@@ -245,7 +242,7 @@ index 77790c9..68ebf23 100644
  }
  #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
  
-@@ -211,90 +413,12 @@ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
+@@ -211,90 +413,12 @@ static void bcm47xx_fill_sprom_r1234589(
  					const char *prefix, bool fallback)
  {
  	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
@@ -336,7 +333,7 @@ index 77790c9..68ebf23 100644
  	nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
  			 &sprom->leddc_off_time, fallback);
  }
-@@ -302,309 +426,10 @@ static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
+@@ -302,309 +426,10 @@ static void bcm47xx_fill_sprom_r3(struct
  static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
  				     const char *prefix, bool fallback)
  {
@@ -646,7 +643,7 @@ index 77790c9..68ebf23 100644
  static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
  					  const char *prefix, bool fallback)
  {
-@@ -741,7 +566,6 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
+@@ -741,7 +566,6 @@ static void bcm47xx_fill_sprom_ethernet(
  static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
  				    bool fallback)
  {
@@ -654,7 +651,7 @@ index 77790c9..68ebf23 100644
  	nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
  			 &sprom->boardflags_hi, fallback);
  	nvram_read_u32_2(prefix, "boardflags2", &sprom->boardflags2_lo,
-@@ -759,48 +583,29 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -759,48 +583,29 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  	switch (sprom->revision) {
  	case 1:
  		bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
@@ -703,7 +700,7 @@ index 77790c9..68ebf23 100644
  		bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
  		break;
  	default:
-@@ -808,8 +613,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -808,8 +613,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  			sprom->revision);
  		sprom->revision = 1;
  		bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
@@ -712,6 +709,3 @@ index 77790c9..68ebf23 100644
  	}
  
  	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch b/target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
index 05b6d2d42e..7577da10a8 100644
--- a/target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
@@ -19,8 +19,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index ba632ff..dee1c32 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -98,7 +98,7 @@ found:
@@ -54,6 +52,3 @@ index ba632ff..dee1c32 100644
  		}
  
  		err = mtd_read(mtd, 0, len, &bytes_read, dst);
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch b/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
index c74bd06495..7a3ddc3980 100644
--- a/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
@@ -22,8 +22,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 13 +++++--------
  1 file changed, 5 insertions(+), 8 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index dee1c32..95d028c 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -171,7 +171,7 @@ static int nvram_init(void)
@@ -35,7 +33,7 @@ index dee1c32..95d028c 100644
  
  	if (!name)
  		return -EINVAL;
-@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *nam
  
  	/* Look for name=value and return value */
  	var = &nvram_buf[sizeof(struct nvram_header)];
@@ -59,6 +57,3 @@ index dee1c32..95d028c 100644
  	}
  	return -ENOENT;
  }
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch b/target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
index 6c09264b48..7a5babc667 100644
--- a/target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
@@ -21,11 +21,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  include/linux/ssb/ssb.h   | 5 ++++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 68ebf23..4048083 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -201,6 +201,9 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
+@@ -201,6 +201,9 @@ static void bcm47xx_sprom_fill_auto(stru
  	bool fb = fallback;
  
  	ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
diff --git a/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch b/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
index e3c8e1352d..957bb680bd 100644
--- a/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
@@ -21,8 +21,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  include/linux/ssb/ssb.h   | 3 +++
  2 files changed, 9 insertions(+)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 4048083..92a6c9d 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
 @@ -531,6 +531,8 @@ static int mac_addr_used = 2;
@@ -34,7 +32,7 @@ index 4048083..92a6c9d 100644
  	nvram_read_macaddr(prefix, "et0macaddr", sprom->et0mac, fallback);
  	nvram_read_u8(prefix, NULL, "et0mdcport", &sprom->et0mdcport, 0,
  		      fallback);
-@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
+@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet(
  	nvram_read_u8(prefix, NULL, "et1phyaddr", &sprom->et1phyaddr, 0,
  		      fallback);
  
diff --git a/target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch b/target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
index d3873d4ae6..314a6c4904 100644
--- a/target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
@@ -27,8 +27,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h |  4 ---
  3 files changed, 22 insertions(+), 29 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
-index 82ff9fd..98c075f 100644
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 @@ -206,9 +206,6 @@ void __init bcm47xx_bus_setup(void)
@@ -41,11 +39,9 @@ index 82ff9fd..98c075f 100644
  	}
  #endif
  
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 92a6c9d..b0d62e7 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -640,19 +640,6 @@ void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
+@@ -640,19 +640,6 @@ void bcm47xx_fill_ssb_boardinfo(struct s
  }
  #endif
  
@@ -65,7 +61,7 @@ index 92a6c9d..b0d62e7 100644
  #if defined(CONFIG_BCM47XX_SSB)
  static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
  {
-@@ -707,33 +694,46 @@ static void bcm47xx_sprom_apply_prefix_alias(char *prefix, size_t prefix_size)
+@@ -707,33 +694,46 @@ static void bcm47xx_sprom_apply_prefix_a
  
  static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
  {
@@ -121,11 +117,9 @@ index 92a6c9d..b0d62e7 100644
  }
  #endif
  
-diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-index 8ed77f6..1461c10 100644
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-@@ -52,10 +52,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -52,10 +52,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
  				const char *prefix);
  #endif
@@ -136,6 +130,3 @@ index 8ed77f6..1461c10 100644
  
  void bcm47xx_set_system_type(u16 chip_id);
  
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch b/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
index 329fe812cc..38b95d2eca 100644
--- a/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
@@ -25,8 +25,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/mm/tlb-r4k.c             | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
-index ab698ba..135a540 100644
 --- a/arch/mips/bcm47xx/prom.c
 +++ b/arch/mips/bcm47xx/prom.c
 @@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void)
@@ -38,8 +36,6 @@ index ab698ba..135a540 100644
  {
  	write_c0_pagemask(PM_DEFAULT_MASK);
  	write_c0_wired(0);
-diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
-index 7d56686..832e216 100644
 --- a/arch/mips/include/asm/pgtable-32.h
 +++ b/arch/mips/include/asm/pgtable-32.h
 @@ -18,7 +18,7 @@
@@ -51,11 +47,9 @@ index 7d56686..832e216 100644
  
  /*
   * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
-diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
-index 08318ec..5037d58 100644
 --- a/arch/mips/mm/tlb-r4k.c
 +++ b/arch/mips/mm/tlb-r4k.c
-@@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void)
+@@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void
   * lifetime of the system
   */
  
@@ -64,6 +58,3 @@ index 08318ec..5037d58 100644
  
  __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
  			       unsigned long entryhi, unsigned long pagemask)
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch b/target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
index 430edc4531..73f066238d 100644
--- a/target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
@@ -20,11 +20,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |  2 ++
  4 files changed, 28 insertions(+)
 
-diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
-index bd56415..a88975a 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
-@@ -149,6 +149,7 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = {
+@@ -149,6 +149,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
  /* board_id */
  static const
  struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
@@ -32,11 +30,9 @@ index bd56415..a88975a 100644
  	{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
-diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
-index 276276a..08a4abf 100644
 --- a/arch/mips/bcm47xx/buttons.c
 +++ b/arch/mips/bcm47xx/buttons.c
-@@ -299,6 +299,13 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __initconst = {
+@@ -299,6 +299,13 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __in
  	BCM47XX_GPIO_KEY(6, KEY_RESTART),
  };
  
@@ -50,7 +46,7 @@ index 276276a..08a4abf 100644
  /* Microsoft */
  
  static const struct gpio_keys_button
-@@ -555,6 +562,10 @@ int __init bcm47xx_buttons_register(void)
+@@ -555,6 +562,10 @@ int __init bcm47xx_buttons_register(void
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);
  		break;
  
@@ -61,11 +57,9 @@ index 276276a..08a4abf 100644
  	case BCM47XX_BOARD_MICROSOFT_MN700:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_microsoft_nm700);
  		break;
-diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
-index 0e4ade3..d20ae63 100644
 --- a/arch/mips/bcm47xx/leds.c
 +++ b/arch/mips/bcm47xx/leds.c
-@@ -370,6 +370,16 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
+@@ -370,6 +370,16 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
  	BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  };
  
@@ -93,8 +87,6 @@ index 0e4ade3..d20ae63 100644
  	case BCM47XX_BOARD_MICROSOFT_MN700:
  		bcm47xx_set_pdata(bcm47xx_leds_microsoft_nm700);
  		break;
-diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-index c41d1dc..2afb840 100644
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 @@ -80,6 +80,8 @@ enum bcm47xx_board {
@@ -106,6 +98,3 @@ index c41d1dc..2afb840 100644
  	BCM47XX_BOARD_MICROSOFT_MN700,
  
  	BCM47XX_BOARD_MOTOROLA_WE800G,
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch b/target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
index bfa93af41c..105c65142a 100644
--- a/target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
@@ -22,11 +22,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  include/linux/bcm47xx_nvram.h | 15 +++++++++++
  2 files changed, 60 insertions(+), 15 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 95d028c..2ed762e 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -94,17 +94,22 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
+@@ -94,17 +94,22 @@ static int nvram_find_and_copy(void __io
  	return -ENXIO;
  
  found:
@@ -94,7 +92,7 @@ index 95d028c..2ed762e 100644
  		return 0;
  	}
  #endif
-@@ -219,3 +226,26 @@ int bcm47xx_nvram_gpio_pin(const char *name)
+@@ -219,3 +226,26 @@ int bcm47xx_nvram_gpio_pin(const char *n
  	return -ENOENT;
  }
  EXPORT_SYMBOL(bcm47xx_nvram_gpio_pin);
@@ -121,8 +119,6 @@ index 95d028c..2ed762e 100644
 +	return nvram;
 +}
 +EXPORT_SYMBOL(bcm47xx_nvram_get_contents);
-diff --git a/include/linux/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h
-index b12b07e..c73927c 100644
 --- a/include/linux/bcm47xx_nvram.h
 +++ b/include/linux/bcm47xx_nvram.h
 @@ -10,11 +10,17 @@
@@ -143,7 +139,7 @@ index b12b07e..c73927c 100644
  #else
  static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
  {
-@@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin(const char *name)
+@@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin
  {
  	return -ENOTSUPP;
  };
@@ -159,6 +155,3 @@ index b12b07e..c73927c 100644
  #endif
  
  #endif /* __BCM47XX_NVRAM_H */
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch b/target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
index ab7ceaa0f3..053144a07d 100644
--- a/target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
@@ -24,8 +24,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 37 ++++++++++++++++---------------------
  1 file changed, 16 insertions(+), 21 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 2ed762e..9ccdce8 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -35,6 +35,7 @@ struct nvram_header {
@@ -36,7 +34,7 @@ index 2ed762e..9ccdce8 100644
  static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
  
  static u32 find_nvram_size(void __iomem *end)
-@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
+@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __io
  	u32 *src, *dst;
  	u32 size;
  
@@ -103,7 +101,7 @@ index 2ed762e..9ccdce8 100644
  	}
  #endif
  
-@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
+@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *nam
  	if (!name)
  		return -EINVAL;
  
@@ -112,7 +110,7 @@ index 2ed762e..9ccdce8 100644
  		err = nvram_init();
  		if (err)
  			return err;
-@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t *nvram_size)
+@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t
  {
  	int err;
  	char *nvram;
@@ -131,6 +129,3 @@ index 2ed762e..9ccdce8 100644
  	nvram = vmalloc(*nvram_size);
  	if (!nvram)
  		return NULL;
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch b/target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
index 0114daa137..5bcbaa5765 100644
--- a/target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
+++ b/target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
@@ -18,8 +18,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/Kconfig | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
-index fc21d36..51ed599 100644
 --- a/arch/mips/bcm47xx/Kconfig
 +++ b/arch/mips/bcm47xx/Kconfig
 @@ -25,7 +25,6 @@ config BCM47XX_BCMA
@@ -30,6 +28,3 @@ index fc21d36..51ed599 100644
  	select BCMA_DRIVER_PCI_HOSTMODE if PCI
  	select BCMA_DRIVER_GPIO
  	default y
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
index e860acb22c..d7d2d7e59a 100644
--- a/target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
+++ b/target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
@@ -15,11 +15,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  drivers/ssb/driver_pcicore.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
-index 15a7ee3..c603d19 100644
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
-@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc,
+@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struc
  	SSB_WARN_ON(!pc->hostmode);
  	if (unlikely(len != 1 && len != 2 && len != 4))
  		goto out;
@@ -30,6 +28,3 @@ index 15a7ee3..c603d19 100644
  	addr = get_cfgspace_addr(pc, bus, dev, func, off);
  	if (unlikely(!addr))
  		goto out;
--- 
-1.8.4.5
-
diff --git a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index 07562b28fc..433d77b6c1 100644
--- a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
+@@ -616,6 +616,44 @@ static void __init ubiblock_create_from_
  	}
  }
  
@@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static void ubiblock_remove_all(void)
  {
  	struct ubiblock *next;
-@@ -644,6 +682,10 @@ int __init ubiblock_init(void)
+@@ -646,6 +684,10 @@ int __init ubiblock_init(void)
  	 */
  	ubiblock_create_from_param();
  
diff --git a/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
index f080fd1532..18737524e8 100644
--- a/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
+++ b/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
@@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "ubi-media.h"
  #include "ubi.h"
-@@ -437,6 +438,15 @@ int ubiblock_create(struct ubi_volume_in
+@@ -439,6 +440,15 @@ int ubiblock_create(struct ubi_volume_in
  	add_disk(dev->gd);
  	dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
  		 dev->ubi_num, dev->vol_id, vi->name);
diff --git a/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch b/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch
index 28b8bcfbcb..621d08f4f1 100644
--- a/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch
+++ b/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch
@@ -10,7 +10,7 @@
  	{USB_DEVICE(0x0af0, 0xd155)},
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -1323,6 +1323,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1330,6 +1330,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
  		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
  		0 ),
  
diff --git a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
index a3a606275e..dcb80c8685 100644
--- a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
@@ -138,7 +138,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  /*
   * Define if arch has non-standard setup.  This is a _PCI_ standard
-@@ -865,6 +868,12 @@ struct ata_port {
+@@ -874,6 +877,12 @@ struct ata_port {
  #ifdef CONFIG_ATA_ACPI
  	struct ata_acpi_gtm	__acpi_init_gtm; /* use ata_acpi_init_gtm() */
  #endif
diff --git a/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch b/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
index 854131c7f6..4fb62dd529 100644
--- a/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
+++ b/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
@@ -7,8 +7,8 @@
 +#include <dt-bindings/mfd/qcom-rpm.h>
  #include <dt-bindings/soc/qcom,gsbi.h>
  #include <dt-bindings/reset/qcom,gcc-ipq806x.h>
- 
-@@ -75,6 +76,63 @@
+ #include <include/dt-bindings/interrupt-controller/arm-gic.h>
+@@ -76,6 +77,63 @@
  		ranges;
  		compatible = "simple-bus";
  
@@ -72,7 +72,7 @@
  		qcom_pinmux: pinmux@800000 {
  			compatible = "qcom,ipq8064-pinctrl";
  			reg = <0x800000 0x4000>;
-@@ -119,6 +177,12 @@
+@@ -120,6 +178,12 @@
  			reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
  		};
  
diff --git a/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch b/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch
index f699521dd1..52af41371c 100644
--- a/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch
+++ b/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch
@@ -47,7 +47,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------
 
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -1688,21 +1688,24 @@ static struct clk_core *clk_propagate_ra
+@@ -1696,21 +1696,24 @@ static struct clk_core *clk_propagate_ra
   * walk down a subtree and set the new rates notifying the rate
   * change on the way
   */
@@ -79,7 +79,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------
  
  	if (clk->new_parent && clk->new_parent != clk->parent) {
  		old_parent = __clk_set_parent_before(clk, clk->new_parent);
-@@ -1722,7 +1725,7 @@ static void clk_change_rate(struct clk_c
+@@ -1730,7 +1733,7 @@ static void clk_change_rate(struct clk_c
  	if (!skip_set_rate && clk->ops->set_rate)
  		clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_rate);
  
@@ -88,7 +88,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------
  
  	if (clk->notifier_count && old_rate != clk->rate)
  		__clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate);
-@@ -1735,12 +1738,13 @@ static void clk_change_rate(struct clk_c
+@@ -1743,12 +1746,13 @@ static void clk_change_rate(struct clk_c
  		/* Skip children who will be reparented to another clock */
  		if (child->new_parent && child->new_parent != clk)
  			continue;
@@ -105,7 +105,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------
  }
  
  static int clk_core_set_rate_nolock(struct clk_core *clk,
-@@ -1749,6 +1753,7 @@ static int clk_core_set_rate_nolock(stru
+@@ -1757,6 +1761,7 @@ static int clk_core_set_rate_nolock(stru
  	struct clk_core *top, *fail_clk;
  	unsigned long rate = req_rate;
  	int ret = 0;
@@ -113,7 +113,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------
  
  	if (!clk)
  		return 0;
-@@ -1774,8 +1779,13 @@ static int clk_core_set_rate_nolock(stru
+@@ -1782,8 +1787,13 @@ static int clk_core_set_rate_nolock(stru
  		return -EBUSY;
  	}
  
diff --git a/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
index d3363f84a8..a5d9c41818 100644
--- a/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
+++ b/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
@@ -47,7 +47,7 @@ handles that problem on Krait, but on other platforms it won't work.
  	struct clk_core		*new_parent;
  	struct clk_core		*new_child;
  	unsigned long		flags;
-@@ -1549,7 +1552,8 @@ out:
+@@ -1557,7 +1560,8 @@ out:
  static void clk_calc_subtree(struct clk_core *clk, unsigned long new_rate,
  			     struct clk_core *new_parent, u8 p_index)
  {
@@ -57,7 +57,7 @@ handles that problem on Krait, but on other platforms it won't work.
  
  	clk->new_rate = new_rate;
  	clk->new_parent = new_parent;
-@@ -1559,6 +1563,18 @@ static void clk_calc_subtree(struct clk_
+@@ -1567,6 +1571,18 @@ static void clk_calc_subtree(struct clk_
  	if (new_parent && new_parent != clk->parent)
  		new_parent->new_child = clk;
  
@@ -76,7 +76,7 @@ handles that problem on Krait, but on other platforms it won't work.
  	hlist_for_each_entry(child, &clk->children, child_node) {
  		child->new_rate = clk_recalc(child, new_rate);
  		clk_calc_subtree(child, child->new_rate, NULL, 0);
-@@ -1654,14 +1670,43 @@ static struct clk_core *clk_propagate_ra
+@@ -1662,14 +1678,43 @@ static struct clk_core *clk_propagate_ra
  						  unsigned long event)
  {
  	struct clk_core *child, *tmp_clk, *fail_clk = NULL;
@@ -123,7 +123,7 @@ handles that problem on Krait, but on other platforms it won't work.
  			fail_clk = clk;
  	}
  
-@@ -1707,7 +1752,8 @@ clk_change_rate(struct clk_core *clk, un
+@@ -1715,7 +1760,8 @@ clk_change_rate(struct clk_core *clk, un
  
  	old_rate = clk->rate;
  
@@ -133,7 +133,7 @@ handles that problem on Krait, but on other platforms it won't work.
  		old_parent = __clk_set_parent_before(clk, clk->new_parent);
  
  		if (clk->ops->set_rate_and_parent) {
-@@ -1727,9 +1773,6 @@ clk_change_rate(struct clk_core *clk, un
+@@ -1735,9 +1781,6 @@ clk_change_rate(struct clk_core *clk, un
  
  	clk->rate = clk->new_rate;
  
@@ -143,7 +143,7 @@ handles that problem on Krait, but on other platforms it won't work.
  	/*
  	 * Use safe iteration, as change_rate can actually swap parents
  	 * for certain clock types.
-@@ -1789,6 +1832,8 @@ static int clk_core_set_rate_nolock(stru
+@@ -1797,6 +1840,8 @@ static int clk_core_set_rate_nolock(stru
  
  	clk->req_rate = req_rate;
  
diff --git a/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch b/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
index 9f8d8cb7e8..a3c3bbfc9e 100644
--- a/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
+++ b/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -23,6 +23,11 @@
+@@ -24,6 +24,11 @@
  			next-level-cache = <&L2>;
  			qcom,acc = <&acc0>;
  			qcom,saw = <&saw0>;
@@ -12,7 +12,7 @@
  		};
  
  		cpu@1 {
-@@ -33,11 +38,24 @@
+@@ -34,11 +39,24 @@
  			next-level-cache = <&L2>;
  			qcom,acc = <&acc1>;
  			qcom,saw = <&saw1>;
@@ -37,7 +37,7 @@
  		};
  	};
  
-@@ -70,6 +88,46 @@
+@@ -71,6 +89,46 @@
  		};
  	};
  
@@ -84,7 +84,7 @@
  	soc: soc {
  		#address-cells = <1>;
  		#size-cells = <1>;
-@@ -170,11 +228,13 @@
+@@ -171,11 +229,13 @@
  		acc0: clock-controller@2088000 {
  			compatible = "qcom,kpss-acc-v1";
  			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
diff --git a/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch
index fb7547f96b..1ce68e8276 100644
--- a/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch
+++ b/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch
@@ -1,7 +1,5 @@
-Index: linux-3.18-rc4/arch/arm/include/asm/glue-cache.h
-===================================================================
---- linux-3.18-rc4.orig/arch/arm/include/asm/glue-cache.h
-+++ linux-3.18-rc4/arch/arm/include/asm/glue-cache.h
+--- a/arch/arm/include/asm/glue-cache.h
++++ b/arch/arm/include/asm/glue-cache.h
 @@ -156,11 +156,19 @@ static inline void nop_dma_unmap_area(co
  #define __cpuc_flush_user_range		__glue(_CACHE,_flush_user_cache_range)
  #define __cpuc_coherent_kern_range	__glue(_CACHE,_coherent_kern_range)
@@ -22,11 +20,9 @@ Index: linux-3.18-rc4/arch/arm/include/asm/glue-cache.h
  #endif
  
  #endif
-Index: linux-3.18-rc4/arch/arm/mm/Kconfig
-===================================================================
---- linux-3.18-rc4.orig/arch/arm/mm/Kconfig
-+++ linux-3.18-rc4/arch/arm/mm/Kconfig
-@@ -843,6 +843,17 @@ config DMA_CACHE_RWFO
+--- a/arch/arm/mm/Kconfig
++++ b/arch/arm/mm/Kconfig
+@@ -844,6 +844,17 @@ config DMA_CACHE_RWFO
  	  in hardware, other workarounds are needed (e.g. cache
  	  maintenance broadcasting in software via FIQ).
  
@@ -44,10 +40,8 @@ Index: linux-3.18-rc4/arch/arm/mm/Kconfig
  config OUTER_CACHE
  	bool
  
-Index: linux-3.18-rc4/arch/arm/mm/flush.c
-===================================================================
---- linux-3.18-rc4.orig/arch/arm/mm/flush.c
-+++ linux-3.18-rc4/arch/arm/mm/flush.c
+--- a/arch/arm/mm/flush.c
++++ b/arch/arm/mm/flush.c
 @@ -314,7 +314,11 @@ void flush_dcache_page(struct page *page
  
  	mapping = page_mapping(page);
diff --git a/target/linux/oxnas/patches-4.0/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-4.0/250-add-plxtech-vendor-prefix.patch
index c495258d30..8eead43c9f 100644
--- a/target/linux/oxnas/patches-4.0/250-add-plxtech-vendor-prefix.patch
+++ b/target/linux/oxnas/patches-4.0/250-add-plxtech-vendor-prefix.patch
@@ -1,8 +1,6 @@
-Index: linux-3.18-rc4/Documentation/devicetree/bindings/vendor-prefixes.txt
-===================================================================
---- linux-3.18-rc4.orig/Documentation/devicetree/bindings/vendor-prefixes.txt
-+++ linux-3.18-rc4/Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -113,6 +113,7 @@ panasonic	Panasonic Corporation
+--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
++++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
+@@ -139,6 +139,7 @@ pericom	Pericom Technology Inc.
  phytec	PHYTEC Messtechnik GmbH
  picochip	Picochip Ltd
  plathome	Plat'Home Co., Ltd.
diff --git a/target/linux/oxnas/patches-4.0/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-4.0/300-introduce-oxnas-platform.patch
index 465e5b7c47..078eddc1ec 100644
--- a/target/linux/oxnas/patches-4.0/300-introduce-oxnas-platform.patch
+++ b/target/linux/oxnas/patches-4.0/300-introduce-oxnas-platform.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/arch/arm/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/arch/arm/Kconfig
-+++ linux-4.0-rc4/arch/arm/Kconfig
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
 @@ -356,6 +356,17 @@ config ARCH_VERSATILE
  	help
  	  This enables support for ARM Ltd Versatile board.
@@ -20,7 +18,7 @@ Index: linux-4.0-rc4/arch/arm/Kconfig
  config ARCH_AT91
  	bool "Atmel AT91"
  	select ARCH_REQUIRE_GPIOLIB
-@@ -916,6 +927,8 @@ source "arch/arm/mach-omap2/Kconfig"
+@@ -917,6 +928,8 @@ source "arch/arm/mach-omap2/Kconfig"
  
  source "arch/arm/mach-orion5x/Kconfig"
  
@@ -29,10 +27,8 @@ Index: linux-4.0-rc4/arch/arm/Kconfig
  source "arch/arm/mach-picoxcell/Kconfig"
  
  source "arch/arm/mach-pxa/Kconfig"
-Index: linux-4.0-rc4/arch/arm/Makefile
-===================================================================
---- linux-4.0-rc4.orig/arch/arm/Makefile
-+++ linux-4.0-rc4/arch/arm/Makefile
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
 @@ -188,6 +188,7 @@ machine-$(CONFIG_ARCH_NSPIRE)		+= nspire
  machine-$(CONFIG_ARCH_OMAP1)		+= omap1
  machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
@@ -41,10 +37,8 @@ Index: linux-4.0-rc4/arch/arm/Makefile
  machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell
  machine-$(CONFIG_ARCH_PXA)		+= pxa
  machine-$(CONFIG_ARCH_QCOM)		+= qcom
-Index: linux-4.0-rc4/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-4.0-rc4.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.0-rc4/arch/arm/boot/dts/Makefile
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
 @@ -429,6 +429,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
  	orion5x-lacie-ethernet-disk-mini-v2.dtb \
  	orion5x-maxtor-shared-storage-2.dtb \
@@ -53,10 +47,8 @@ Index: linux-4.0-rc4/arch/arm/boot/dts/Makefile
  dtb-$(CONFIG_ARCH_PRIMA2) += \
  	prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
-Index: linux-4.0-rc4/arch/arm/tools/mach-types
-===================================================================
---- linux-4.0-rc4.orig/arch/arm/tools/mach-types
-+++ linux-4.0-rc4/arch/arm/tools/mach-types
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
 @@ -228,6 +228,7 @@ edb9302a		MACH_EDB9302A		EDB9302A		1127
  edb9307a		MACH_EDB9307A		EDB9307A		1128
  omap_3430sdp		MACH_OMAP_3430SDP	OMAP_3430SDP		1138
@@ -65,10 +57,8 @@ Index: linux-4.0-rc4/arch/arm/tools/mach-types
  micro9m			MACH_MICRO9M		MICRO9M			1169
  bug			MACH_BUG		BUG			1179
  at91sam9263ek		MACH_AT91SAM9263EK	AT91SAM9263EK		1202
-Index: linux-4.0-rc4/drivers/clk/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/clk/Makefile
-+++ linux-4.0-rc4/drivers/clk/Makefile
+--- a/drivers/clk/Makefile
++++ b/drivers/clk/Makefile
 @@ -31,6 +31,7 @@ obj-$(CONFIG_COMMON_CLK_MAX77802)	+= clk
  obj-$(CONFIG_ARCH_MOXART)		+= clk-moxart.o
  obj-$(CONFIG_ARCH_NOMADIK)		+= clk-nomadik.o
diff --git a/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch b/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
index 73d7285af1..e7bc603382 100644
--- a/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
+++ b/target/linux/oxnas/patches-4.0/310-oxnas-clocksource.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/clocksource/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/clocksource/Kconfig
-+++ linux-4.0-rc4/drivers/clocksource/Kconfig
+--- a/drivers/clocksource/Kconfig
++++ b/drivers/clocksource/Kconfig
 @@ -172,6 +172,12 @@ config VF_PIT_TIMER
  	help
  	  Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
@@ -15,10 +13,8 @@ Index: linux-4.0-rc4/drivers/clocksource/Kconfig
  config SYS_SUPPORTS_SH_CMT
          bool
  
-Index: linux-4.0-rc4/drivers/clocksource/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/clocksource/Makefile
-+++ linux-4.0-rc4/drivers/clocksource/Makefile
+--- a/drivers/clocksource/Makefile
++++ b/drivers/clocksource/Makefile
 @@ -38,6 +38,7 @@ obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o
diff --git a/target/linux/oxnas/patches-4.0/320-oxnas-irqchip.patch b/target/linux/oxnas/patches-4.0/320-oxnas-irqchip.patch
index 054c9ddeab..4501263b17 100644
--- a/target/linux/oxnas/patches-4.0/320-oxnas-irqchip.patch
+++ b/target/linux/oxnas/patches-4.0/320-oxnas-irqchip.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/irqchip/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/irqchip/Kconfig
-+++ linux-4.0-rc4/drivers/irqchip/Kconfig
+--- a/drivers/irqchip/Kconfig
++++ b/drivers/irqchip/Kconfig
 @@ -27,6 +27,11 @@ config ARM_GIC_V3_ITS
  	bool
  	select PCI_MSI_IRQ_DOMAIN
@@ -14,10 +12,8 @@ Index: linux-4.0-rc4/drivers/irqchip/Kconfig
  config ARM_NVIC
  	bool
  	select IRQ_DOMAIN
-Index: linux-4.0-rc4/drivers/irqchip/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/irqchip/Makefile
-+++ linux-4.0-rc4/drivers/irqchip/Makefile
+--- a/drivers/irqchip/Makefile
++++ b/drivers/irqchip/Makefile
 @@ -30,6 +30,7 @@ obj-$(CONFIG_IMGPDC_IRQ)		+= irq-imgpdc.
  obj-$(CONFIG_SIRF_IRQ)			+= irq-sirfsoc.o
  obj-$(CONFIG_RENESAS_INTC_IRQPIN)	+= irq-renesas-intc-irqpin.o
@@ -26,10 +22,8 @@ Index: linux-4.0-rc4/drivers/irqchip/Makefile
  obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o
  obj-$(CONFIG_ARCH_NSPIRE)		+= irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)		+= irq-vt8500.o
-Index: linux-4.0-rc4/drivers/irqchip/irq-gic.c
-===================================================================
---- linux-4.0-rc4.orig/drivers/irqchip/irq-gic.c
-+++ linux-4.0-rc4/drivers/irqchip/irq-gic.c
+--- a/drivers/irqchip/irq-gic.c
++++ b/drivers/irqchip/irq-gic.c
 @@ -1086,6 +1086,7 @@ IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,
  IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
  IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
diff --git a/target/linux/oxnas/patches-4.0/330-oxnas-pinctrl.patch b/target/linux/oxnas/patches-4.0/330-oxnas-pinctrl.patch
index c037d7271d..1183fbe5d0 100644
--- a/target/linux/oxnas/patches-4.0/330-oxnas-pinctrl.patch
+++ b/target/linux/oxnas/patches-4.0/330-oxnas-pinctrl.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/pinctrl/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/pinctrl/Kconfig
-+++ linux-4.0-rc4/drivers/pinctrl/Kconfig
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
 @@ -188,6 +188,15 @@ config PINCTRL_COH901
  	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
  	  ports of 8 GPIO pins each.
@@ -18,10 +16,8 @@ Index: linux-4.0-rc4/drivers/pinctrl/Kconfig
  config PINCTRL_PALMAS
  	bool "Pinctrl driver for the PALMAS Series MFD devices"
  	depends on OF && MFD_PALMAS
-Index: linux-4.0-rc4/drivers/pinctrl/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/pinctrl/Makefile
-+++ linux-4.0-rc4/drivers/pinctrl/Makefile
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
 @@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl
  obj-$(CONFIG_PINCTRL_BCM281XX)	+= pinctrl-bcm281xx.o
  obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o
diff --git a/target/linux/oxnas/patches-4.0/340-oxnas-pcie.patch b/target/linux/oxnas/patches-4.0/340-oxnas-pcie.patch
index a105f61740..63175cc984 100644
--- a/target/linux/oxnas/patches-4.0/340-oxnas-pcie.patch
+++ b/target/linux/oxnas/patches-4.0/340-oxnas-pcie.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/pci/host/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/pci/host/Kconfig
-+++ linux-4.0-rc4/drivers/pci/host/Kconfig
+--- a/drivers/pci/host/Kconfig
++++ b/drivers/pci/host/Kconfig
 @@ -106,4 +106,9 @@ config PCI_VERSATILE
  	bool "ARM Versatile PB PCI controller"
  	depends on ARCH_VERSATILE
@@ -12,10 +10,8 @@ Index: linux-4.0-rc4/drivers/pci/host/Kconfig
 +	select PCIEPORTBUS
 +
  endmenu
-Index: linux-4.0-rc4/drivers/pci/host/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/pci/host/Makefile
-+++ linux-4.0-rc4/drivers/pci/host/Makefile
+--- a/drivers/pci/host/Makefile
++++ b/drivers/pci/host/Makefile
 @@ -3,6 +3,7 @@ obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
  obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
diff --git a/target/linux/oxnas/patches-4.0/350-oxnas-reset.patch b/target/linux/oxnas/patches-4.0/350-oxnas-reset.patch
index 0b0f0ae3c8..1cecd28dc7 100644
--- a/target/linux/oxnas/patches-4.0/350-oxnas-reset.patch
+++ b/target/linux/oxnas/patches-4.0/350-oxnas-reset.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/reset/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/reset/Kconfig
-+++ linux-4.0-rc4/drivers/reset/Kconfig
+--- a/drivers/reset/Kconfig
++++ b/drivers/reset/Kconfig
 @@ -12,4 +12,9 @@ menuconfig RESET_CONTROLLER
  
  	  If unsure, say no.
@@ -12,10 +10,8 @@ Index: linux-4.0-rc4/drivers/reset/Kconfig
 +
  source "drivers/reset/sti/Kconfig"
 +
-Index: linux-4.0-rc4/drivers/reset/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/reset/Makefile
-+++ linux-4.0-rc4/drivers/reset/Makefile
+--- a/drivers/reset/Makefile
++++ b/drivers/reset/Makefile
 @@ -1,4 +1,5 @@
  obj-$(CONFIG_RESET_CONTROLLER) += core.o
 +obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o
diff --git a/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch b/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
index 555b715501..c59da359ba 100644
--- a/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
+++ b/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/mtd/nand/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/mtd/nand/Kconfig
-+++ linux-4.0-rc4/drivers/mtd/nand/Kconfig
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
 @@ -530,4 +530,12 @@ config MTD_NAND_HISI504
  	help
  	  Enables support for NAND controller on Hisilicon SoC Hip04.
@@ -15,10 +13,8 @@ Index: linux-4.0-rc4/drivers/mtd/nand/Kconfig
 +	  to the STATIC Unit.
 +
  endif # MTD_NAND
-Index: linux-4.0-rc4/drivers/mtd/nand/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/mtd/nand/Makefile
-+++ linux-4.0-rc4/drivers/mtd/nand/Makefile
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
 @@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_NAND_SOCRATES)		+= socr
  obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
  obj-$(CONFIG_MTD_NAND_NUC900)		+= nuc900_nand.o
diff --git a/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch b/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
index c9b11e99d8..af5e66ff03 100644
--- a/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
+++ b/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/ata/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/ata/Kconfig
-+++ linux-4.0-rc4/drivers/ata/Kconfig
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
 @@ -401,6 +401,13 @@ config SATA_VITESSE
  
  	  If unsure, say N.
@@ -16,10 +14,8 @@ Index: linux-4.0-rc4/drivers/ata/Kconfig
  comment "PATA SFF controllers with BMDMA"
  
  config PATA_ALI
-Index: linux-4.0-rc4/drivers/ata/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/ata/Makefile
-+++ linux-4.0-rc4/drivers/ata/Makefile
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
 @@ -37,6 +37,7 @@ obj-$(CONFIG_SATA_SVW)		+= sata_svw.o
  obj-$(CONFIG_SATA_ULI)		+= sata_uli.o
  obj-$(CONFIG_SATA_VIA)		+= sata_via.o
diff --git a/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch b/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
index 1272e3dde2..ea47d3bf0c 100644
--- a/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
+++ b/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/usb/host/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/usb/host/Kconfig
-+++ linux-4.0-rc4/drivers/usb/host/Kconfig
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
 @@ -306,6 +306,13 @@ config USB_OCTEON_EHCI
  	  USB 2.0 device support.  All CN6XXX based chips with USB are
  	  supported.
@@ -16,10 +14,8 @@ Index: linux-4.0-rc4/drivers/usb/host/Kconfig
  endif # USB_EHCI_HCD
  
  config USB_OXU210HP_HCD
-Index: linux-4.0-rc4/drivers/usb/host/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/usb/host/Makefile
-+++ linux-4.0-rc4/drivers/usb/host/Makefile
+--- a/drivers/usb/host/Makefile
++++ b/drivers/usb/host/Makefile
 @@ -42,6 +42,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
  obj-$(CONFIG_USB_EHCI_MSM)	+= ehci-msm.o
  obj-$(CONFIG_USB_EHCI_TEGRA)	+= ehci-tegra.o
diff --git a/target/linux/oxnas/patches-4.0/900-more-boards.patch b/target/linux/oxnas/patches-4.0/900-more-boards.patch
index 77948c902c..ffc7618e3b 100644
--- a/target/linux/oxnas/patches-4.0/900-more-boards.patch
+++ b/target/linux/oxnas/patches-4.0/900-more-boards.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-4.0-rc4.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.0-rc4/arch/arm/boot/dts/Makefile
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
 @@ -429,7 +429,10 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
  	orion5x-lacie-ethernet-disk-mini-v2.dtb \
  	orion5x-maxtor-shared-storage-2.dtb \
diff --git a/target/linux/oxnas/patches-4.0/999-libata-hacks.patch b/target/linux/oxnas/patches-4.0/999-libata-hacks.patch
index 399d821c2c..504bbdb087 100644
--- a/target/linux/oxnas/patches-4.0/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-4.0/999-libata-hacks.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/ata/libata-core.c
-===================================================================
---- linux-4.0-rc4.orig/drivers/ata/libata-core.c
-+++ linux-4.0-rc4/drivers/ata/libata-core.c
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
 @@ -1586,6 +1586,14 @@ unsigned ata_exec_internal_sg(struct ata
  		return AC_ERR_SYSTEM;
  	}
@@ -17,7 +15,7 @@ Index: linux-4.0-rc4/drivers/ata/libata-core.c
  	/* initialize internal qc */
  
  	/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -4749,6 +4757,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4760,6 +4768,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
  	if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
  		return NULL;
  
@@ -25,22 +23,20 @@ Index: linux-4.0-rc4/drivers/ata/libata-core.c
 +		return NULL;
 +
  	/* libsas case */
- 	if (!ap->scsi_host) {
+ 	if (ap->flags & ATA_FLAG_SAS_HOST) {
  		tag = ata_sas_allocate_tag(ap);
-@@ -4794,6 +4805,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4805,6 +4816,8 @@ void ata_qc_free(struct ata_queued_cmd *
  		qc->tag = ATA_TAG_POISON;
- 		if (!ap->scsi_host)
+ 		if (ap->flags & ATA_FLAG_SAS_HOST)
  			ata_sas_free_tag(tag, ap);
 +		if (ap->ops->qc_free)
 +			ap->ops->qc_free(qc);
  	}
  }
  
-Index: linux-4.0-rc4/include/linux/libata.h
-===================================================================
---- linux-4.0-rc4.orig/include/linux/libata.h
-+++ linux-4.0-rc4/include/linux/libata.h
-@@ -893,6 +893,8 @@ struct ata_port_operations {
+--- a/include/linux/libata.h
++++ b/include/linux/libata.h
+@@ -903,6 +903,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);
@@ -49,7 +45,7 @@ Index: linux-4.0-rc4/include/linux/libata.h
  
  	/*
  	 * Configuration and exception handling
-@@ -983,6 +985,9 @@ struct ata_port_operations {
+@@ -993,6 +995,9 @@ struct ata_port_operations {
  	void (*phy_reset)(struct ata_port *ap);
  	void (*eng_timeout)(struct ata_port *ap);