From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 18 May 2009 13:08:46 +0000 (+0000)
Subject: upgrade to 2.6.30-rc6, refresh patches
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9db4496e781c6b6a08cfb804607bb49cdc757457;p=librecmc%2Flibrecmc.git

upgrade to 2.6.30-rc6, refresh patches

SVN-Revision: 15912
---

diff --git a/target/linux/cavium-octeon/Makefile b/target/linux/cavium-octeon/Makefile
index 4904a8989c..1cb2c0923a 100644
--- a/target/linux/cavium-octeon/Makefile
+++ b/target/linux/cavium-octeon/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Octeon
 FEATURES:=squashfs jffs2 pci
 CFLAGS:=-Os -pipe -funit-at-a-time
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch
index 53ebffc8bd..b37b4a7577 100644
--- a/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch
+++ b/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch
@@ -10,8 +10,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/include/asm/delay.h    |    4 ++++
  2 files changed, 11 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h
-index 71f5c5c..1f0954d 100644
 --- a/arch/mips/include/asm/compiler.h
 +++ b/arch/mips/include/asm/compiler.h
 @@ -16,4 +16,11 @@
@@ -26,11 +24,9 @@ index 71f5c5c..1f0954d 100644
 +#endif
 +
  #endif /* _ASM_COMPILER_H */
-diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h
-index b0bccd2..3e467e8 100644
 --- a/arch/mips/include/asm/delay.h
 +++ b/arch/mips/include/asm/delay.h
-@@ -83,10 +83,14 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
+@@ -83,10 +83,14 @@ static inline void __udelay(unsigned lon
  		: "r" (usecs), "r" (lpj)
  		: GCC_REG_ACCUM);
  	else if (sizeof(long) == 8 && !R4000_WAR)
@@ -45,8 +41,3 @@ index b0bccd2..3e467e8 100644
  	else if (sizeof(long) == 8 && R4000_WAR)
  		__asm__("dmultu\t%3, %4\n\tmfhi\t%0"
  		: "=r" (usecs), "=h" (hi), "=l" (lo)
--- 
-1.5.6.5
-
-
-
diff --git a/target/linux/cavium-octeon/patches/002-register_defs_pci.patch b/target/linux/cavium-octeon/patches/002-register_defs_pci.patch
index 2252cbf43a..85a910dd94 100644
--- a/target/linux/cavium-octeon/patches/002-register_defs_pci.patch
+++ b/target/linux/cavium-octeon/patches/002-register_defs_pci.patch
@@ -19,9 +19,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  create mode 100644 arch/mips/include/asm/octeon/cvmx-pescx-defs.h
  create mode 100644 arch/mips/include/asm/octeon/cvmx-pexp-defs.h
 
-diff --git a/arch/mips/include/asm/octeon/cvmx-npei-defs.h b/arch/mips/include/asm/octeon/cvmx-npei-defs.h
-new file mode 100644
-index 0000000..4b347bb
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-npei-defs.h
 @@ -0,0 +1,2560 @@
@@ -2585,9 +2582,6 @@ index 0000000..4b347bb
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-npi-defs.h b/arch/mips/include/asm/octeon/cvmx-npi-defs.h
-new file mode 100644
-index 0000000..4e03cd8
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-npi-defs.h
 @@ -0,0 +1,1735 @@
@@ -4326,9 +4320,6 @@ index 0000000..4e03cd8
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-pci-defs.h b/arch/mips/include/asm/octeon/cvmx-pci-defs.h
-new file mode 100644
-index 0000000..90f8d65
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pci-defs.h
 @@ -0,0 +1,1645 @@
@@ -5977,9 +5968,6 @@ index 0000000..90f8d65
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-pcieep-defs.h b/arch/mips/include/asm/octeon/cvmx-pcieep-defs.h
-new file mode 100644
-index 0000000..d553f8e
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pcieep-defs.h
 @@ -0,0 +1,1365 @@
@@ -7348,9 +7336,6 @@ index 0000000..d553f8e
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h b/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h
-new file mode 100644
-index 0000000..75574c9
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h
 @@ -0,0 +1,1397 @@
@@ -8751,9 +8736,6 @@ index 0000000..75574c9
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-pescx-defs.h b/arch/mips/include/asm/octeon/cvmx-pescx-defs.h
-new file mode 100644
-index 0000000..d71bd9c
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pescx-defs.h
 @@ -0,0 +1,410 @@
@@ -9167,9 +9149,6 @@ index 0000000..d71bd9c
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-pexp-defs.h b/arch/mips/include/asm/octeon/cvmx-pexp-defs.h
-new file mode 100644
-index 0000000..5ea5dc5
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pexp-defs.h
 @@ -0,0 +1,229 @@
@@ -9402,6 +9381,3 @@ index 0000000..5ea5dc5
 +	 CVMX_ADD_IO_SEG(0x00011F0000008380ull)
 +
 +#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
index 96ff2c2bf0..79009a6c9b 100644
--- a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
+++ b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
@@ -38,35 +38,29 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  create mode 100644 arch/mips/include/asm/octeon/cvmx-pcie.h
  create mode 100644 arch/mips/include/asm/octeon/cvmx-wqe.h
 
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index ea2b262..f009496 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -620,6 +620,8 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -617,6 +617,8 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
  	select SYS_HAS_EARLY_PRINTK
- 	select CPU_CAVIUM_OCTEON
+ 	select SYS_HAS_CPU_CAVIUM_OCTEON
  	select SWAP_IO_SPACE
 +	select HW_HAS_PCI
 +	select ARCH_SUPPORTS_MSI
  	help
  	  This option supports all of the Octeon reference boards from Cavium
  	  Networks. It builds a kernel that dynamically determines the Octeon
-diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile
-index 1c2a7fa..2b5f08f 100644
 --- a/arch/mips/cavium-octeon/Makefile
 +++ b/arch/mips/cavium-octeon/Makefile
-@@ -14,5 +14,9 @@
+@@ -14,5 +14,9 @@ obj-y += dma-octeon.o flash_setup.o
  obj-y += octeon-memcpy.o
-
+ 
  obj-$(CONFIG_SMP)                     += smp.o
 +obj-$(CONFIG_PCI)                     += pci-common.o
 +obj-$(CONFIG_PCI)                     += pci.o
 +obj-$(CONFIG_PCI)                     += pcie.o
 +obj-$(CONFIG_PCI_MSI)                 += msi.o
-
+ 
  EXTRA_CFLAGS += -Werror
-diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
-index 01b1ef9..af3c26f 100644
 --- a/arch/mips/cavium-octeon/dma-octeon.c
 +++ b/arch/mips/cavium-octeon/dma-octeon.c
 @@ -13,20 +13,326 @@
@@ -398,8 +392,6 @@ index 01b1ef9..af3c26f 100644
  	return;
 +#endif
  }
-diff --git a/arch/mips/cavium-octeon/executive/Makefile b/arch/mips/cavium-octeon/executive/Makefile
-index 80d6cb2..9b470dd 100644
 --- a/arch/mips/cavium-octeon/executive/Makefile
 +++ b/arch/mips/cavium-octeon/executive/Makefile
 @@ -11,3 +11,5 @@
@@ -408,9 +400,6 @@ index 80d6cb2..9b470dd 100644
  
 +obj-$(CONFIG_PCI) += cvmx-pcie.o
 +obj-$(CONFIG_PCI) += cvmx-helper-errata.o cvmx-helper-util.o
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
-new file mode 100644
-index 0000000..98822c1
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
 @@ -0,0 +1,379 @@
@@ -793,9 +782,6 @@ index 0000000..98822c1
 +	}
 +	cvmx_helper_qlm_jtag_update(qlm);
 +}
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
-new file mode 100644
-index 0000000..dc0087c
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
 @@ -0,0 +1,502 @@
@@ -1301,9 +1287,6 @@ index 0000000..dc0087c
 +		jtgd.u64 = cvmx_read_csr(CVMX_CIU_QLM_JTGD);
 +	} while (jtgd.s.update);
 +}
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-pcie.c b/arch/mips/cavium-octeon/executive/cvmx-pcie.c
-new file mode 100644
-index 0000000..710f21f
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/executive/cvmx-pcie.c
 @@ -0,0 +1,1053 @@
@@ -2360,9 +2343,6 @@ index 0000000..710f21f
 +		       mem_access_subid.u64);
 +	return 0;
 +}
-diff --git a/arch/mips/cavium-octeon/msi.c b/arch/mips/cavium-octeon/msi.c
-new file mode 100644
-index 0000000..964b03b
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/msi.c
 @@ -0,0 +1,288 @@
@@ -2654,8 +2634,6 @@ index 0000000..964b03b
 +}
 +
 +subsys_initcall(octeon_msi_initialize);
-diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
-index 788d588..3d7be84 100644
 --- a/arch/mips/cavium-octeon/octeon-irq.c
 +++ b/arch/mips/cavium-octeon/octeon-irq.c
 @@ -10,6 +10,8 @@
@@ -2667,9 +2645,6 @@ index 788d588..3d7be84 100644
  
  DEFINE_RWLOCK(octeon_irq_ciu0_rwlock);
  DEFINE_RWLOCK(octeon_irq_ciu1_rwlock);
-diff --git a/arch/mips/cavium-octeon/pci-common.c b/arch/mips/cavium-octeon/pci-common.c
-new file mode 100644
-index 0000000..cd029f8
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/pci-common.c
 @@ -0,0 +1,137 @@
@@ -2810,9 +2785,6 @@ index 0000000..cd029f8
 +
 +	return 0;
 +}
-diff --git a/arch/mips/cavium-octeon/pci-common.h b/arch/mips/cavium-octeon/pci-common.h
-new file mode 100644
-index 0000000..74ae799
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/pci-common.h
 @@ -0,0 +1,39 @@
@@ -2855,9 +2827,6 @@ index 0000000..74ae799
 +extern enum octeon_dma_bar_type octeon_dma_bar_type;
 +
 +#endif
-diff --git a/arch/mips/cavium-octeon/pci.c b/arch/mips/cavium-octeon/pci.c
-new file mode 100644
-index 0000000..67c0ff5
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/pci.c
 @@ -0,0 +1,568 @@
@@ -3429,9 +3398,6 @@ index 0000000..67c0ff5
 +}
 +
 +arch_initcall(octeon_pci_setup);
-diff --git a/arch/mips/cavium-octeon/pcie.c b/arch/mips/cavium-octeon/pcie.c
-new file mode 100644
-index 0000000..cb6662c
 --- /dev/null
 +++ b/arch/mips/cavium-octeon/pcie.c
 @@ -0,0 +1,441 @@
@@ -3876,8 +3842,6 @@ index 0000000..cb6662c
 +}
 +
 +arch_initcall(octeon_pcie_setup);
-diff --git a/arch/mips/include/asm/octeon/cvmx-asm.h b/arch/mips/include/asm/octeon/cvmx-asm.h
-index b21d3fc..093bcaf 100644
 --- a/arch/mips/include/asm/octeon/cvmx-asm.h
 +++ b/arch/mips/include/asm/octeon/cvmx-asm.h
 @@ -119,7 +119,8 @@
@@ -3890,9 +3854,6 @@ index b21d3fc..093bcaf 100644
  /* some new cop0-like stuff */
  #define CVMX_RDHWR(result, regstr) \
  	asm volatile ("rdhwr %[rt],$" CVMX_TMP_STR(regstr) : [rt] "=d" (result))
-diff --git a/arch/mips/include/asm/octeon/cvmx-helper-errata.h b/arch/mips/include/asm/octeon/cvmx-helper-errata.h
-new file mode 100644
-index 0000000..ce5deea
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-helper-errata.h
 @@ -0,0 +1,92 @@
@@ -3988,9 +3949,6 @@ index 0000000..ce5deea
 +extern void __cvmx_helper_errata_qlm_disable_2nd_order_cdr(int qlm);
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h
-new file mode 100644
-index 0000000..d720217
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
 @@ -0,0 +1,266 @@
@@ -4260,8 +4218,6 @@ index 0000000..d720217
 +extern void cvmx_helper_qlm_jtag_update(int qlm);
 +
 +#endif /* __CVMX_HELPER_H__ */
-diff --git a/arch/mips/include/asm/octeon/cvmx-packet.h b/arch/mips/include/asm/octeon/cvmx-packet.h
-index 38aefa1..1cb3419 100644
 --- a/arch/mips/include/asm/octeon/cvmx-packet.h
 +++ b/arch/mips/include/asm/octeon/cvmx-packet.h
 @@ -25,7 +25,8 @@
@@ -4302,9 +4258,6 @@ index 38aefa1..1cb3419 100644
  		/* The size of the segment pointed to by addr (in bytes) */
  		uint64_t size:16;
  		/* Pointer to the first byte of the data, NOT buffer */
-diff --git a/arch/mips/include/asm/octeon/cvmx-pcie.h b/arch/mips/include/asm/octeon/cvmx-pcie.h
-new file mode 100644
-index 0000000..55a5ac1
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-pcie.h
 @@ -0,0 +1,284 @@
@@ -4592,9 +4545,6 @@ index 0000000..55a5ac1
 +int cvmx_pcie_ep_initialize(void);
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h
-new file mode 100644
-index 0000000..fadc700
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-wqe.h
 @@ -0,0 +1,422 @@
@@ -5020,11 +4970,9 @@ index 0000000..fadc700
 +} CVMX_CACHE_LINE_ALIGNED;
 +
 +#endif /* __CVMX_WQE_H__ */
-diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
-index 03fddfa..e31e3fe 100644
 --- a/arch/mips/include/asm/octeon/cvmx.h
 +++ b/arch/mips/include/asm/octeon/cvmx.h
-@@ -376,6 +376,18 @@ static inline uint64_t cvmx_get_cycle(void)
+@@ -376,6 +376,18 @@ static inline uint64_t cvmx_get_cycle(vo
  }
  
  /**
@@ -5043,17 +4991,12 @@ index 03fddfa..e31e3fe 100644
   * Reads a chip global cycle counter.  This counts CPU cycles since
   * chip reset.  The counter is 64 bit.
   * This register does not exist on CN38XX pass 1 silicion
-diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
-index edc6760..cac9b1a 100644
 --- a/arch/mips/include/asm/octeon/octeon.h
 +++ b/arch/mips/include/asm/octeon/octeon.h
-@@ -245,4 +245,6 @@ static inline uint32_t octeon_npi_read32(uint64_t address)
+@@ -245,4 +245,6 @@ static inline uint32_t octeon_npi_read32
  	return cvmx_read64_uint32(address ^ 4);
  }
  
 +extern struct cvmx_bootinfo *octeon_bootinfo;
 +
  #endif /* __ASM_OCTEON_OCTEON_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/cavium-octeon/patches/004-named_alloc_function.patch b/target/linux/cavium-octeon/patches/004-named_alloc_function.patch
index cb0b9100c0..a3135f0a8a 100644
--- a/target/linux/cavium-octeon/patches/004-named_alloc_function.patch
+++ b/target/linux/cavium-octeon/patches/004-named_alloc_function.patch
@@ -6,11 +6,9 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/include/asm/octeon/cvmx-bootmem.h      |   85 ++++++++++++++++++
  2 files changed, 186 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
-index 4f5a08b..8972448 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
-@@ -97,6 +97,32 @@ void *cvmx_bootmem_alloc(uint64_t size, uint64_t alignment)
+@@ -97,6 +97,32 @@ void *cvmx_bootmem_alloc(uint64_t size, 
  	return cvmx_bootmem_alloc_range(size, alignment, 0, 0);
  }
  
@@ -43,7 +41,7 @@ index 4f5a08b..8972448 100644
  int cvmx_bootmem_free_named(char *name)
  {
  	return cvmx_bootmem_phy_named_block_free(name, 0);
-@@ -584,3 +610,78 @@ int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags)
+@@ -584,3 +610,78 @@ int cvmx_bootmem_phy_named_block_free(ch
  	cvmx_bootmem_unlock();
  	return named_block_ptr != NULL;	/* 0 on failure, 1 on success */
  }
@@ -122,11 +120,9 @@ index 4f5a08b..8972448 100644
 +		cvmx_spinlock_unlock((cvmx_spinlock_t *)&(cvmx_bootmem_desc->lock));
 +	return addr_allocated;
 +}
-diff --git a/arch/mips/include/asm/octeon/cvmx-bootmem.h b/arch/mips/include/asm/octeon/cvmx-bootmem.h
-index 1cbe4b5..8e708bd 100644
 --- a/arch/mips/include/asm/octeon/cvmx-bootmem.h
 +++ b/arch/mips/include/asm/octeon/cvmx-bootmem.h
-@@ -183,6 +183,64 @@ extern void *cvmx_bootmem_alloc_range(uint64_t size, uint64_t alignment,
+@@ -183,6 +183,64 @@ extern void *cvmx_bootmem_alloc_range(ui
   * Returns 0 on failure,
   *         !0 on success
   */
@@ -191,7 +187,7 @@ index 1cbe4b5..8e708bd 100644
  extern int cvmx_bootmem_free_named(char *name);
  
  /**
-@@ -224,6 +282,33 @@ int64_t cvmx_bootmem_phy_alloc(uint64_t req_size, uint64_t address_min,
+@@ -224,6 +282,33 @@ int64_t cvmx_bootmem_phy_alloc(uint64_t 
  			       uint32_t flags);
  
  /**
@@ -225,10 +221,3 @@ index 1cbe4b5..8e708bd 100644
   * Finds a named memory block by name.
   * Also used for finding an unused entry in the named block table.
   *
--- 
-1.5.6.5
-
---
-To unsubscribe from this list: send the line "unsubscribe netdev" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch b/target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch
index 5aa4e65d43..5169f6cf65 100644
--- a/target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch
+++ b/target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch
@@ -11,9 +11,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  create mode 100644 arch/mips/include/asm/octeon/cvmx-mixx-defs.h
  create mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h
 
-diff --git a/arch/mips/include/asm/octeon/cvmx-agl-defs.h b/arch/mips/include/asm/octeon/cvmx-agl-defs.h
-new file mode 100644
-index 0000000..ec94b9a
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-agl-defs.h
 @@ -0,0 +1,1194 @@
@@ -1211,9 +1208,6 @@ index 0000000..ec94b9a
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-mixx-defs.h b/arch/mips/include/asm/octeon/cvmx-mixx-defs.h
-new file mode 100644
-index 0000000..dab6dca
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-mixx-defs.h
 @@ -0,0 +1,248 @@
@@ -1465,9 +1459,6 @@ index 0000000..dab6dca
 +};
 +
 +#endif
-diff --git a/arch/mips/include/asm/octeon/cvmx-smix-defs.h b/arch/mips/include/asm/octeon/cvmx-smix-defs.h
-new file mode 100644
-index 0000000..9ae45fc
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-smix-defs.h
 @@ -0,0 +1,178 @@
@@ -1649,10 +1640,3 @@ index 0000000..9ae45fc
 +};
 +
 +#endif
--- 
-1.5.6.5
-
---
-To unsubscribe from this list: send the line "unsubscribe netdev" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
index 98053105bf..7ea094519e 100644
--- a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
+++ b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
@@ -14,9 +14,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  create mode 100644 drivers/net/octeon/cvmx-mgmt-port.h
  create mode 100644 drivers/net/octeon/octeon-mgmt-port.c
 
-diff --git a/arch/mips/include/asm/octeon/cvmx-mdio.h b/arch/mips/include/asm/octeon/cvmx-mdio.h
-new file mode 100644
-index 0000000..89b0cc8
 --- /dev/null
 +++ b/arch/mips/include/asm/octeon/cvmx-mdio.h
 @@ -0,0 +1,577 @@
@@ -597,11 +594,9 @@ index 0000000..89b0cc8
 +}
 +
 +#endif
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index e9625a5..8c9d29e 100644
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -1864,6 +1864,14 @@ config ATL2
+@@ -2035,6 +2035,14 @@ config ATL2
  	  To compile this driver as a module, choose M here.  The module
  	  will be called atl2.
  
@@ -616,21 +611,16 @@ index e9625a5..8c9d29e 100644
  source "drivers/net/fs_enet/Kconfig"
  
  endif # NET_ETHERNET
-diff --git a/drivers/net/Makefile b/drivers/net/Makefile
-index 4a92305..4cbc22e 100644
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
-@@ -234,6 +234,7 @@
+@@ -234,6 +234,7 @@ pasemi_mac_driver-objs := pasemi_mac.o p
  obj-$(CONFIG_MLX4_CORE) += mlx4/
  obj-$(CONFIG_ENC28J60) += enc28j60.o
  obj-$(CONFIG_ETHOC) += ethoc.o
 +obj-$(CONFIG_OCTEON_MGMT) += octeon/
-
+ 
  obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
-
-diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile
-new file mode 100644
-index 0000000..f32f394
+ 
 --- /dev/null
 +++ b/drivers/net/octeon/Makefile
 @@ -0,0 +1,11 @@
@@ -646,9 +636,6 @@ index 0000000..f32f394
 +
 +octeon_mgmt-objs := octeon-mgmt-port.o cvmx-mgmt-port.o
 \ No newline at end of file
-diff --git a/drivers/net/octeon/cvmx-mgmt-port.c b/drivers/net/octeon/cvmx-mgmt-port.c
-new file mode 100644
-index 0000000..f60255a
 --- /dev/null
 +++ b/drivers/net/octeon/cvmx-mgmt-port.c
 @@ -0,0 +1,818 @@
@@ -1470,9 +1457,6 @@ index 0000000..f60255a
 +		       (size_without_fcs + 7) & 0xfff8);
 +	cvmx_spinlock_unlock(&state->lock);
 +}
-diff --git a/drivers/net/octeon/cvmx-mgmt-port.h b/drivers/net/octeon/cvmx-mgmt-port.h
-new file mode 100644
-index 0000000..622168c
 --- /dev/null
 +++ b/drivers/net/octeon/cvmx-mgmt-port.h
 @@ -0,0 +1,168 @@
@@ -1644,9 +1628,6 @@ index 0000000..622168c
 +extern void cvmx_mgmt_port_set_max_packet_size(int port, int size_without_fcs);
 +
 +#endif /* __CVMX_MGMT_PORT_H__ */
-diff --git a/drivers/net/octeon/octeon-mgmt-port.c b/drivers/net/octeon/octeon-mgmt-port.c
-new file mode 100644
-index 0000000..9cffbb5
 --- /dev/null
 +++ b/drivers/net/octeon/octeon-mgmt-port.c
 @@ -0,0 +1,389 @@
@@ -2039,10 +2020,3 @@ index 0000000..9cffbb5
 +MODULE_DESCRIPTION("Cavium Networks Octeon management port ethernet driver.");
 +module_init(ethernet_mgmt_port_init);
 +module_exit(ethernet_mgmt_port_cleanup);
--- 
-1.5.6.5
-
---
-To unsubscribe from this list: send the line "unsubscribe netdev" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch b/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
index 7397def952..318916d15b 100644
--- a/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
+++ b/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
@@ -3,8 +3,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/cavium-octeon/executive/cvmx-sysinfo.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
-index 4812370..e583889 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
 @@ -29,6 +29,7 @@
@@ -15,7 +13,7 @@ index 4812370..e583889 100644
  
  #include <asm/octeon/cvmx.h>
  #include <asm/octeon/cvmx-spinlock.h>
-@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(void)
+@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(vo
  {
  	return &(state.sysinfo);
  }
@@ -23,6 +21,3 @@ index 4812370..e583889 100644
  
  /**
   * This function is used in non-simple executive environments (such as
--- 
-1.6.0.6
-
diff --git a/target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch b/target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch
index dd40d79acf..bb375852ff 100644
--- a/target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch
+++ b/target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch
@@ -6,8 +6,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/include/asm/octeon/cvmx-bootinfo.h |   13 +++++++++++++
  1 files changed, 13 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-index 692989a..f3c23a4 100644
 --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 @@ -157,6 +157,13 @@ enum cvmx_board_types_enum {
@@ -24,7 +22,7 @@ index 692989a..f3c23a4 100644
  	CVMX_BOARD_TYPE_MAX,
  
  	/*
-@@ -228,6 +235,12 @@ static inline const char *cvmx_board_type_to_string(enum
+@@ -228,6 +235,12 @@ static inline const char *cvmx_board_typ
  		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC_XLE_4G)
  		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5600)
  		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5201)
@@ -37,6 +35,3 @@ index 692989a..f3c23a4 100644
  		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_MAX)
  
  			/* Customer boards listed here */
--- 
-1.6.0.6
-
diff --git a/target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch b/target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch
index f4a06f202b..63dc4f13de 100644
--- a/target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch
+++ b/target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch
@@ -6,8 +6,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/include/asm/octeon/octeon-feature.h |   27 +++++++++++++++++++++++++
  1 files changed, 27 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h
-index 04fac68..ef24a7b 100644
 --- a/arch/mips/include/asm/octeon/octeon-feature.h
 +++ b/arch/mips/include/asm/octeon/octeon-feature.h
 @@ -57,6 +57,13 @@ enum octeon_feature {
@@ -24,7 +22,7 @@ index 04fac68..ef24a7b 100644
  };
  
  static inline int cvmx_fuse_read(int fuse);
-@@ -112,6 +119,26 @@ static inline int octeon_has_feature(enum octeon_feature feature)
+@@ -112,6 +119,26 @@ static inline int octeon_has_feature(enu
  	case OCTEON_FEATURE_USB:
  		return !(OCTEON_IS_MODEL(OCTEON_CN38XX)
  			 || OCTEON_IS_MODEL(OCTEON_CN58XX));
@@ -51,6 +49,3 @@ index 04fac68..ef24a7b 100644
  	}
  	return 0;
  }
--- 
-1.6.0.6
-
diff --git a/target/linux/cavium-octeon/patches/010-export_erratum_function.patch b/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
index 27c9e794b9..83b09fbede 100644
--- a/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
+++ b/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
@@ -3,8 +3,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  .../cavium-octeon/executive/cvmx-helper-errata.c   |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
-index 8fb8205..868659e 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
 @@ -33,6 +33,8 @@
@@ -15,12 +13,9 @@ index 8fb8205..868659e 100644
 +
  #include <asm/octeon/octeon.h>
  
- #include <asm/octeon/cvmx-helper-jtag.h>
-@@ -68,3 +70,4 @@ void __cvmx_helper_errata_qlm_disable_2nd_order_cdr(int qlm)
+ #include <asm/octeon/cvmx-helper-util.h>
+@@ -377,3 +379,4 @@ void __cvmx_helper_errata_qlm_disable_2n
  	}
  	cvmx_helper_qlm_jtag_update(qlm);
  }
 +EXPORT_SYMBOL(__cvmx_helper_errata_qlm_disable_2nd_order_cdr);
--- 
-1.6.0.6
-
diff --git a/target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch b/target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch
index 443114b83a..dec15866b0 100644
--- a/target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch
+++ b/target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch
@@ -163,9 +163,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  create mode 100644 drivers/staging/octeon/ethernet.c
  create mode 100644 drivers/staging/octeon/octeon-ethernet.h
 
-diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
-new file mode 100644
-index 0000000..536e238
 --- /dev/null
 +++ b/drivers/staging/octeon/Kconfig
 @@ -0,0 +1,12 @@
@@ -181,9 +178,6 @@ index 0000000..536e238
 +	  To compile this driver as a module, choose M here.  The module
 +	  will be called octeon-ethernet.
 +
-diff --git a/drivers/staging/octeon/Makefile b/drivers/staging/octeon/Makefile
-new file mode 100644
-index 0000000..3c839e3
 --- /dev/null
 +++ b/drivers/staging/octeon/Makefile
 @@ -0,0 +1,30 @@
@@ -217,9 +211,6 @@ index 0000000..3c839e3
 +	cvmx-helper-loop.o cvmx-helper-spi.o cvmx-helper-util.o \
 +	cvmx-interrupt-decodes.o cvmx-interrupt-rsl.o
 +
-diff --git a/drivers/staging/octeon/cvmx-address.h b/drivers/staging/octeon/cvmx-address.h
-new file mode 100644
-index 0000000..3c74d82
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-address.h
 @@ -0,0 +1,274 @@
@@ -497,9 +488,6 @@ index 0000000..3c74d82
 +#define CVMX_OCT_DID_ZIP_CSR        CVMX_FULL_DID(CVMX_OCT_DID_ZIP, 0ULL)
 +
 +#endif /* __CVMX_ADDRESS_H__ */
-diff --git a/drivers/staging/octeon/cvmx-asxx-defs.h b/drivers/staging/octeon/cvmx-asxx-defs.h
-new file mode 100644
-index 0000000..91415a8
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-asxx-defs.h
 @@ -0,0 +1,475 @@
@@ -978,9 +966,6 @@ index 0000000..91415a8
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-cmd-queue.c b/drivers/staging/octeon/cvmx-cmd-queue.c
-new file mode 100644
-index 0000000..976227b
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-cmd-queue.c
 @@ -0,0 +1,306 @@
@@ -1290,9 +1275,6 @@ index 0000000..976227b
 +	else
 +		return NULL;
 +}
-diff --git a/drivers/staging/octeon/cvmx-cmd-queue.h b/drivers/staging/octeon/cvmx-cmd-queue.h
-new file mode 100644
-index 0000000..f0cb20f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-cmd-queue.h
 @@ -0,0 +1,617 @@
@@ -1913,9 +1895,6 @@ index 0000000..f0cb20f
 +}
 +
 +#endif /* __CVMX_CMD_QUEUE_H__ */
-diff --git a/drivers/staging/octeon/cvmx-config.h b/drivers/staging/octeon/cvmx-config.h
-new file mode 100644
-index 0000000..078a520
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-config.h
 @@ -0,0 +1,169 @@
@@ -2088,9 +2067,6 @@ index 0000000..078a520
 +
 +#endif /* __CVMX_CONFIG_H__ */
 +
-diff --git a/drivers/staging/octeon/cvmx-dbg-defs.h b/drivers/staging/octeon/cvmx-dbg-defs.h
-new file mode 100644
-index 0000000..abbf42d
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-dbg-defs.h
 @@ -0,0 +1,72 @@
@@ -2166,9 +2142,6 @@ index 0000000..abbf42d
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-fau.h b/drivers/staging/octeon/cvmx-fau.h
-new file mode 100644
-index 0000000..29bdce6
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-fau.h
 @@ -0,0 +1,597 @@
@@ -2769,9 +2742,6 @@ index 0000000..29bdce6
 +}
 +
 +#endif /* __CVMX_FAU_H__ */
-diff --git a/drivers/staging/octeon/cvmx-fpa-defs.h b/drivers/staging/octeon/cvmx-fpa-defs.h
-new file mode 100644
-index 0000000..bf5546b
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-fpa-defs.h
 @@ -0,0 +1,403 @@
@@ -3178,9 +3148,6 @@ index 0000000..bf5546b
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-fpa.c b/drivers/staging/octeon/cvmx-fpa.c
-new file mode 100644
-index 0000000..55d9147
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-fpa.c
 @@ -0,0 +1,183 @@
@@ -3367,9 +3334,6 @@ index 0000000..55d9147
 +		return 0;
 +	}
 +}
-diff --git a/drivers/staging/octeon/cvmx-fpa.h b/drivers/staging/octeon/cvmx-fpa.h
-new file mode 100644
-index 0000000..1d7788f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-fpa.h
 @@ -0,0 +1,299 @@
@@ -3672,9 +3636,6 @@ index 0000000..1d7788f
 +uint64_t cvmx_fpa_get_block_size(uint64_t pool);
 +
 +#endif /*  __CVM_FPA_H__ */
-diff --git a/drivers/staging/octeon/cvmx-gmxx-defs.h b/drivers/staging/octeon/cvmx-gmxx-defs.h
-new file mode 100644
-index 0000000..946a43a
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-gmxx-defs.h
 @@ -0,0 +1,2529 @@
@@ -6207,9 +6168,6 @@ index 0000000..946a43a
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-board.c b/drivers/staging/octeon/cvmx-helper-board.c
-new file mode 100644
-index 0000000..3085e38
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-board.c
 @@ -0,0 +1,706 @@
@@ -6919,9 +6877,6 @@ index 0000000..3085e38
 +
 +	return supported_ports;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/drivers/staging/octeon/cvmx-helper-board.h
-new file mode 100644
-index 0000000..dc20b01
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-board.h
 @@ -0,0 +1,180 @@
@@ -7105,9 +7060,6 @@ index 0000000..dc20b01
 +int __cvmx_helper_board_usb_get_num_ports(int supported_ports);
 +
 +#endif /* __CVMX_HELPER_BOARD_H__ */
-diff --git a/drivers/staging/octeon/cvmx-helper-fpa.c b/drivers/staging/octeon/cvmx-helper-fpa.c
-new file mode 100644
-index 0000000..c239e5f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-fpa.c
 @@ -0,0 +1,243 @@
@@ -7354,9 +7306,6 @@ index 0000000..c239e5f
 +					    CVMX_FPA_DFA_POOL_SIZE,
 +					    dfa_buffers);
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-fpa.h b/drivers/staging/octeon/cvmx-helper-fpa.h
-new file mode 100644
-index 0000000..5ff8c93
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-fpa.h
 @@ -0,0 +1,64 @@
@@ -7424,9 +7373,6 @@ index 0000000..5ff8c93
 +				      int tim_buffers, int dfa_buffers);
 +
 +#endif /* __CVMX_HELPER_H__ */
-diff --git a/drivers/staging/octeon/cvmx-helper-loop.c b/drivers/staging/octeon/cvmx-helper-loop.c
-new file mode 100644
-index 0000000..55a571a
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-loop.c
 @@ -0,0 +1,85 @@
@@ -7515,9 +7461,6 @@ index 0000000..55a571a
 +	/* Do nothing. */
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-loop.h b/drivers/staging/octeon/cvmx-helper-loop.h
-new file mode 100644
-index 0000000..e646a6c
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-loop.h
 @@ -0,0 +1,59 @@
@@ -7580,9 +7523,6 @@ index 0000000..e646a6c
 +extern int __cvmx_helper_loop_enable(int interface);
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-npi.c b/drivers/staging/octeon/cvmx-helper-npi.c
-new file mode 100644
-index 0000000..7388a1e
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-npi.c
 @@ -0,0 +1,113 @@
@@ -7699,9 +7639,6 @@ index 0000000..7388a1e
 +	/* Enables are controlled by the remote host, so nothing to do here */
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-npi.h b/drivers/staging/octeon/cvmx-helper-npi.h
-new file mode 100644
-index 0000000..908e7b0
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-npi.h
 @@ -0,0 +1,60 @@
@@ -7765,9 +7702,6 @@ index 0000000..908e7b0
 +extern int __cvmx_helper_npi_enable(int interface);
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-rgmii.c b/drivers/staging/octeon/cvmx-helper-rgmii.c
-new file mode 100644
-index 0000000..aa2d5d7
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-rgmii.c
 @@ -0,0 +1,525 @@
@@ -8296,9 +8230,6 @@ index 0000000..aa2d5d7
 +	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-rgmii.h b/drivers/staging/octeon/cvmx-helper-rgmii.h
-new file mode 100644
-index 0000000..ea26526
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-rgmii.h
 @@ -0,0 +1,110 @@
@@ -8412,9 +8343,6 @@ index 0000000..ea26526
 +						  int enable_external);
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-sgmii.c b/drivers/staging/octeon/cvmx-helper-sgmii.c
-new file mode 100644
-index 0000000..6214e3b
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-sgmii.c
 @@ -0,0 +1,550 @@
@@ -8968,9 +8896,6 @@ index 0000000..6214e3b
 +	__cvmx_helper_sgmii_hardware_init_link(interface, index);
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-sgmii.h b/drivers/staging/octeon/cvmx-helper-sgmii.h
-new file mode 100644
-index 0000000..19b48d6
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-sgmii.h
 @@ -0,0 +1,104 @@
@@ -9078,9 +9003,6 @@ index 0000000..19b48d6
 +						  int enable_external);
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-spi.c b/drivers/staging/octeon/cvmx-helper-spi.c
-new file mode 100644
-index 0000000..8ba6c83
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-spi.c
 @@ -0,0 +1,195 @@
@@ -9279,9 +9201,6 @@ index 0000000..8ba6c83
 +	   info */
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-spi.h b/drivers/staging/octeon/cvmx-helper-spi.h
-new file mode 100644
-index 0000000..69bac03
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-spi.h
 @@ -0,0 +1,84 @@
@@ -9369,9 +9288,6 @@ index 0000000..69bac03
 +				      cvmx_helper_link_info_t link_info);
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper-util.c b/drivers/staging/octeon/cvmx-helper-util.c
-new file mode 100644
-index 0000000..41ef8a4
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-util.c
 @@ -0,0 +1,433 @@
@@ -9808,9 +9724,6 @@ index 0000000..41ef8a4
 +
 +	return -1;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-util.h b/drivers/staging/octeon/cvmx-helper-util.h
-new file mode 100644
-index 0000000..6a6e52f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-util.h
 @@ -0,0 +1,215 @@
@@ -10029,9 +9942,6 @@ index 0000000..6a6e52f
 +extern int cvmx_helper_get_interface_index_num(int ipd_port);
 +
 +#endif /* __CVMX_HELPER_H__ */
-diff --git a/drivers/staging/octeon/cvmx-helper-xaui.c b/drivers/staging/octeon/cvmx-helper-xaui.c
-new file mode 100644
-index 0000000..a11e676
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-xaui.c
 @@ -0,0 +1,348 @@
@@ -10383,9 +10293,6 @@ index 0000000..a11e676
 +	/* Take the link through a reset */
 +	return __cvmx_helper_xaui_enable(interface);
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper-xaui.h b/drivers/staging/octeon/cvmx-helper-xaui.h
-new file mode 100644
-index 0000000..4b4db2f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper-xaui.h
 @@ -0,0 +1,103 @@
@@ -10492,9 +10399,6 @@ index 0000000..4b4db2f
 +						 int enable_internal,
 +						 int enable_external);
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-helper.c b/drivers/staging/octeon/cvmx-helper.c
-new file mode 100644
-index 0000000..5915066
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper.c
 @@ -0,0 +1,1058 @@
@@ -11556,9 +11460,6 @@ index 0000000..5915066
 +	}
 +	return result;
 +}
-diff --git a/drivers/staging/octeon/cvmx-helper.h b/drivers/staging/octeon/cvmx-helper.h
-new file mode 100644
-index 0000000..51916f3
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-helper.h
 @@ -0,0 +1,227 @@
@@ -11789,9 +11690,6 @@ index 0000000..51916f3
 +					  int enable_external);
 +
 +#endif /* __CVMX_HELPER_H__ */
-diff --git a/drivers/staging/octeon/cvmx-interrupt-decodes.c b/drivers/staging/octeon/cvmx-interrupt-decodes.c
-new file mode 100644
-index 0000000..a3337e3
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-interrupt-decodes.c
 @@ -0,0 +1,371 @@
@@ -12166,9 +12064,6 @@ index 0000000..a3337e3
 +	}
 +	cvmx_write_csr(CVMX_STXX_INT_MSK(index), stx_int_msk.u64);
 +}
-diff --git a/drivers/staging/octeon/cvmx-interrupt-rsl.c b/drivers/staging/octeon/cvmx-interrupt-rsl.c
-new file mode 100644
-index 0000000..df50048
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-interrupt-rsl.c
 @@ -0,0 +1,140 @@
@@ -12312,9 +12207,6 @@ index 0000000..df50048
 +	for (index = 0; index < num_ports; index++)
 +		__cvmx_interrupt_gmxx_rxx_int_en_enable(index, interface);
 +}
-diff --git a/drivers/staging/octeon/cvmx-ipd.h b/drivers/staging/octeon/cvmx-ipd.h
-new file mode 100644
-index 0000000..115a552
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-ipd.h
 @@ -0,0 +1,338 @@
@@ -12656,9 +12548,6 @@ index 0000000..115a552
 +}
 +
 +#endif /*  __CVMX_IPD_H__ */
-diff --git a/drivers/staging/octeon/cvmx-mdio.h b/drivers/staging/octeon/cvmx-mdio.h
-new file mode 100644
-index 0000000..c987a75
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-mdio.h
 @@ -0,0 +1,506 @@
@@ -13168,9 +13057,6 @@ index 0000000..c987a75
 +}
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-packet.h b/drivers/staging/octeon/cvmx-packet.h
-new file mode 100644
-index 0000000..62ffe78
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-packet.h
 @@ -0,0 +1,65 @@
@@ -13239,9 +13125,6 @@ index 0000000..62ffe78
 +};
 +
 +#endif /*  __CVMX_PACKET_H__ */
-diff --git a/drivers/staging/octeon/cvmx-pcsx-defs.h b/drivers/staging/octeon/cvmx-pcsx-defs.h
-new file mode 100644
-index 0000000..d45952d
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pcsx-defs.h
 @@ -0,0 +1,370 @@
@@ -13615,9 +13498,6 @@ index 0000000..d45952d
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-pcsxx-defs.h b/drivers/staging/octeon/cvmx-pcsxx-defs.h
-new file mode 100644
-index 0000000..55d120f
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pcsxx-defs.h
 @@ -0,0 +1,316 @@
@@ -13937,9 +13817,6 @@ index 0000000..55d120f
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-pip-defs.h b/drivers/staging/octeon/cvmx-pip-defs.h
-new file mode 100644
-index 0000000..5a36910
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pip-defs.h
 @@ -0,0 +1,1267 @@
@@ -15210,9 +15087,6 @@ index 0000000..5a36910
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-pip.h b/drivers/staging/octeon/cvmx-pip.h
-new file mode 100644
-index 0000000..78dbce8
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pip.h
 @@ -0,0 +1,524 @@
@@ -15740,9 +15614,6 @@ index 0000000..78dbce8
 +}
 +
 +#endif /*  __CVMX_PIP_H__ */
-diff --git a/drivers/staging/octeon/cvmx-pko-defs.h b/drivers/staging/octeon/cvmx-pko-defs.h
-new file mode 100644
-index 0000000..50e779c
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pko-defs.h
 @@ -0,0 +1,1133 @@
@@ -16879,9 +16750,6 @@ index 0000000..50e779c
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-pko.c b/drivers/staging/octeon/cvmx-pko.c
-new file mode 100644
-index 0000000..00db915
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pko.c
 @@ -0,0 +1,506 @@
@@ -17391,9 +17259,6 @@ index 0000000..00db915
 +	cvmx_write_csr(CVMX_PKO_MEM_PORT_RATE1, pko_mem_port_rate1.u64);
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-pko.h b/drivers/staging/octeon/cvmx-pko.h
-new file mode 100644
-index 0000000..f068c19
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pko.h
 @@ -0,0 +1,610 @@
@@ -18007,9 +17872,6 @@ index 0000000..f068c19
 +extern int cvmx_pko_rate_limit_bits(int port, uint64_t bits_s, int burst);
 +
 +#endif /* __CVMX_PKO_H__ */
-diff --git a/drivers/staging/octeon/cvmx-pow.h b/drivers/staging/octeon/cvmx-pow.h
-new file mode 100644
-index 0000000..c5d66f2
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-pow.h
 @@ -0,0 +1,1982 @@
@@ -19995,9 +19857,6 @@ index 0000000..c5d66f2
 +extern int cvmx_pow_get_num_entries(void);
 +
 +#endif /* __CVMX_POW_H__ */
-diff --git a/drivers/staging/octeon/cvmx-scratch.h b/drivers/staging/octeon/cvmx-scratch.h
-new file mode 100644
-index 0000000..96b70cf
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-scratch.h
 @@ -0,0 +1,139 @@
@@ -20140,9 +19999,6 @@ index 0000000..96b70cf
 +}
 +
 +#endif /* __CVMX_SCRATCH_H__ */
-diff --git a/drivers/staging/octeon/cvmx-smix-defs.h b/drivers/staging/octeon/cvmx-smix-defs.h
-new file mode 100644
-index 0000000..9ae45fc
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-smix-defs.h
 @@ -0,0 +1,178 @@
@@ -20324,9 +20180,6 @@ index 0000000..9ae45fc
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-spi.c b/drivers/staging/octeon/cvmx-spi.c
-new file mode 100644
-index 0000000..82794d9
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-spi.c
 @@ -0,0 +1,667 @@
@@ -20997,9 +20850,6 @@ index 0000000..82794d9
 +
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/cvmx-spi.h b/drivers/staging/octeon/cvmx-spi.h
-new file mode 100644
-index 0000000..e814648
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-spi.h
 @@ -0,0 +1,269 @@
@@ -21272,9 +21122,6 @@ index 0000000..e814648
 +extern int cvmx_spi_interface_up_cb(int interface, cvmx_spi_mode_t mode);
 +
 +#endif /* __CVMX_SPI_H__ */
-diff --git a/drivers/staging/octeon/cvmx-spxx-defs.h b/drivers/staging/octeon/cvmx-spxx-defs.h
-new file mode 100644
-index 0000000..b16940e
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-spxx-defs.h
 @@ -0,0 +1,347 @@
@@ -21625,9 +21472,6 @@ index 0000000..b16940e
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-srxx-defs.h b/drivers/staging/octeon/cvmx-srxx-defs.h
-new file mode 100644
-index 0000000..d82b366
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-srxx-defs.h
 @@ -0,0 +1,126 @@
@@ -21757,9 +21601,6 @@ index 0000000..d82b366
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-stxx-defs.h b/drivers/staging/octeon/cvmx-stxx-defs.h
-new file mode 100644
-index 0000000..4f209b6
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-stxx-defs.h
 @@ -0,0 +1,292 @@
@@ -22055,9 +21896,6 @@ index 0000000..4f209b6
 +};
 +
 +#endif
-diff --git a/drivers/staging/octeon/cvmx-wqe.h b/drivers/staging/octeon/cvmx-wqe.h
-new file mode 100644
-index 0000000..6536109
 --- /dev/null
 +++ b/drivers/staging/octeon/cvmx-wqe.h
 @@ -0,0 +1,397 @@
@@ -22458,9 +22296,6 @@ index 0000000..6536109
 +} CVMX_CACHE_LINE_ALIGNED cvmx_wqe_t;
 +
 +#endif /* __CVMX_WQE_H__ */
-diff --git a/drivers/staging/octeon/ethernet-common.c b/drivers/staging/octeon/ethernet-common.c
-new file mode 100644
-index 0000000..3e6f5b8
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-common.c
 @@ -0,0 +1,328 @@
@@ -22792,9 +22627,6 @@ index 0000000..3e6f5b8
 +{
 +	/* Currently nothing to do */
 +}
-diff --git a/drivers/staging/octeon/ethernet-common.h b/drivers/staging/octeon/ethernet-common.h
-new file mode 100644
-index 0000000..2bd9cd7
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-common.h
 @@ -0,0 +1,29 @@
@@ -22827,9 +22659,6 @@ index 0000000..2bd9cd7
 +
 +int cvm_oct_common_init(struct net_device *dev);
 +void cvm_oct_common_uninit(struct net_device *dev);
-diff --git a/drivers/staging/octeon/ethernet-defines.h b/drivers/staging/octeon/ethernet-defines.h
-new file mode 100644
-index 0000000..8f7374e
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-defines.h
 @@ -0,0 +1,134 @@
@@ -22967,9 +22796,6 @@ index 0000000..8f7374e
 +
 +
 +#endif /* __ETHERNET_DEFINES_H__ */
-diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
-new file mode 100644
-index 0000000..93cab0a
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-mdio.c
 @@ -0,0 +1,231 @@
@@ -23204,9 +23030,6 @@ index 0000000..93cab0a
 +	}
 +	return 0;
 +}
-diff --git a/drivers/staging/octeon/ethernet-mdio.h b/drivers/staging/octeon/ethernet-mdio.h
-new file mode 100644
-index 0000000..6314141
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-mdio.h
 @@ -0,0 +1,46 @@
@@ -23256,9 +23079,6 @@ index 0000000..6314141
 +extern struct ethtool_ops cvm_oct_ethtool_ops;
 +int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 +int cvm_oct_mdio_setup_device(struct net_device *dev);
-diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c
-new file mode 100644
-index 0000000..b595903
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-mem.c
 @@ -0,0 +1,198 @@
@@ -23460,9 +23280,6 @@ index 0000000..b595903
 +	else
 +		cvm_oct_free_hw_memory(pool, size, elements);
 +}
-diff --git a/drivers/staging/octeon/ethernet-mem.h b/drivers/staging/octeon/ethernet-mem.h
-new file mode 100644
-index 0000000..713f2ed
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-mem.h
 @@ -0,0 +1,29 @@
@@ -23495,9 +23312,6 @@ index 0000000..713f2ed
 +
 +int cvm_oct_mem_fill_fpa(int pool, int size, int elements);
 +void cvm_oct_mem_empty_fpa(int pool, int size, int elements);
-diff --git a/drivers/staging/octeon/ethernet-proc.c b/drivers/staging/octeon/ethernet-proc.c
-new file mode 100644
-index 0000000..8fa88fc
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-proc.c
 @@ -0,0 +1,256 @@
@@ -23757,9 +23571,6 @@ index 0000000..8fa88fc
 +{
 +	remove_proc_entry("octeon_ethernet_stats", NULL);
 +}
-diff --git a/drivers/staging/octeon/ethernet-proc.h b/drivers/staging/octeon/ethernet-proc.h
-new file mode 100644
-index 0000000..82c7d9f
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-proc.h
 @@ -0,0 +1,29 @@
@@ -23792,9 +23603,6 @@ index 0000000..82c7d9f
 +
 +void cvm_oct_proc_initialize(void);
 +void cvm_oct_proc_shutdown(void);
-diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
-new file mode 100644
-index 0000000..8579f16
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-rgmii.c
 @@ -0,0 +1,397 @@
@@ -24195,9 +24003,6 @@ index 0000000..8579f16
 +	if (number_rgmii_ports == 0)
 +		free_irq(OCTEON_IRQ_RML, &number_rgmii_ports);
 +}
-diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-new file mode 100644
-index 0000000..1b237b7
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-rx.c
 @@ -0,0 +1,505 @@
@@ -24706,9 +24511,6 @@ index 0000000..1b237b7
 +	for (i = 0; i < NR_CPUS; i++)
 +		tasklet_kill(&cvm_oct_tasklet[i].t);
 +}
-diff --git a/drivers/staging/octeon/ethernet-rx.h b/drivers/staging/octeon/ethernet-rx.h
-new file mode 100644
-index 0000000..a9b72b8
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-rx.h
 @@ -0,0 +1,33 @@
@@ -24745,9 +24547,6 @@ index 0000000..a9b72b8
 +
 +void cvm_oct_rx_initialize(void);
 +void cvm_oct_rx_shutdown(void);
-diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c
-new file mode 100644
-index 0000000..58fa39c
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-sgmii.c
 @@ -0,0 +1,129 @@
@@ -24880,9 +24679,6 @@ index 0000000..58fa39c
 +{
 +	cvm_oct_common_uninit(dev);
 +}
-diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c
-new file mode 100644
-index 0000000..e0971bb
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-spi.c
 @@ -0,0 +1,323 @@
@@ -25209,9 +25005,6 @@ index 0000000..e0971bb
 +		free_irq(8 + 46, &number_spi_ports);
 +	}
 +}
-diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
-new file mode 100644
-index 0000000..77b7122
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-tx.c
 @@ -0,0 +1,634 @@
@@ -25849,9 +25642,6 @@ index 0000000..77b7122
 +		spin_unlock_irqrestore(&priv->tx_free_list[qos].lock, flags);
 +	}
 +}
-diff --git a/drivers/staging/octeon/ethernet-tx.h b/drivers/staging/octeon/ethernet-tx.h
-new file mode 100644
-index 0000000..5106236
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-tx.h
 @@ -0,0 +1,32 @@
@@ -25887,9 +25677,6 @@ index 0000000..5106236
 +int cvm_oct_transmit_qos(struct net_device *dev, void *work_queue_entry,
 +			 int do_free, int qos);
 +void cvm_oct_tx_shutdown(struct net_device *dev);
-diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h
-new file mode 100644
-index 0000000..37b6659
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-util.h
 @@ -0,0 +1,81 @@
@@ -25974,9 +25761,6 @@ index 0000000..37b6659
 +	else
 +		return ipd_port & 3;
 +}
-diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c
-new file mode 100644
-index 0000000..f08eb32
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet-xaui.c
 @@ -0,0 +1,127 @@
@@ -26107,9 +25891,6 @@ index 0000000..f08eb32
 +{
 +	cvm_oct_common_uninit(dev);
 +}
-diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
-new file mode 100644
-index 0000000..e8ef9e0
 --- /dev/null
 +++ b/drivers/staging/octeon/ethernet.c
 @@ -0,0 +1,507 @@
@@ -26620,9 +26401,6 @@ index 0000000..e8ef9e0
 +MODULE_DESCRIPTION("Cavium Networks Octeon ethernet driver.");
 +module_init(cvm_oct_init_module);
 +module_exit(cvm_oct_cleanup_module);
-diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
-new file mode 100644
-index 0000000..b319907
 --- /dev/null
 +++ b/drivers/staging/octeon/octeon-ethernet.h
 @@ -0,0 +1,127 @@
@@ -26753,6 +26531,3 @@ index 0000000..b319907
 +extern struct net_device *cvm_oct_device[];
 +
 +#endif
--- 
-1.6.0.6
-
diff --git a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
index af2d2b1da9..1a9dc00649 100644
--- a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
+++ b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
@@ -7,8 +7,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  drivers/staging/Makefile |    1 +
  2 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 0dcf9ca..6c2ca23 100644
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
 @@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig"
@@ -19,10 +17,9 @@ index 0dcf9ca..6c2ca23 100644
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
-diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
---- a/drivers/staging/Makefile	2009-05-09 02:14:14.000000000 +0200
-+++ b/drivers/staging/Makefile	2009-05-12 12:38:22.000000000 +0200
-@@ -40,3 +40,4 @@
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -40,3 +40,4 @@ obj-$(CONFIG_PLAN9AUTH)		+= p9auth/
  obj-$(CONFIG_HECI)		+= heci/
  obj-$(CONFIG_LINE6_USB)		+= line6/
  obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100)	+= serqt_usb/
diff --git a/target/linux/cavium-octeon/patches/013-compile_fixes.patch b/target/linux/cavium-octeon/patches/013-compile_fixes.patch
index 8a7d5f0842..89338f4e8f 100644
--- a/target/linux/cavium-octeon/patches/013-compile_fixes.patch
+++ b/target/linux/cavium-octeon/patches/013-compile_fixes.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c	2009-05-06 16:55:28.000000000 +0200
-+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c	2009-05-06 17:04:05.000000000 +0200
-@@ -272,6 +272,7 @@
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
+@@ -272,6 +272,7 @@ fix_ipd_exit:
   *
   * Returns Zero on success, negative on failure
   */
@@ -8,7 +8,7 @@
  int __cvmx_helper_errata_asx_pass1(int interface, int port, int cpu_clock_hz)
  {
  	/* Set hi water mark as per errata GMX-4 */
-@@ -289,6 +290,7 @@
+@@ -289,6 +290,7 @@ int __cvmx_helper_errata_asx_pass1(int i
  			     cpu_clock_hz);
  	return 0;
  }
@@ -16,9 +16,9 @@
  
  /**
   * This function needs to be called on all Octeon chips with
---- a/arch/mips/include/asm/octeon/cvmx-helper-errata.h	2009-05-06 17:12:16.000000000 +0200
-+++ a/arch/mips/include/asm/octeon/cvmx-helper-errata.h	2009-05-06 17:12:10.000000000 +0200
-@@ -60,8 +60,8 @@
+--- a/arch/mips/include/asm/octeon/cvmx-helper-errata.h
++++ b/arch/mips/include/asm/octeon/cvmx-helper-errata.h
+@@ -60,8 +60,8 @@ extern int __cvmx_helper_errata_fix_ipd_
   *
   * Returns Zero on success, negative on failure
   */
@@ -29,9 +29,9 @@
  
  /**
   * This function needs to be called on all Octeon chips with
---- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c	2009-05-06 17:30:47.000000000 +0200
-+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c	2009-05-06 17:31:01.000000000 +0200
-@@ -356,6 +356,7 @@
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+@@ -356,6 +356,7 @@ int cvmx_helper_get_ipd_port(int interfa
   *
   * Returns Interface number
   */
@@ -39,7 +39,7 @@
  int cvmx_helper_get_interface_num(int ipd_port)
  {
  	if (ipd_port < 16)
-@@ -372,6 +373,7 @@
+@@ -372,6 +373,7 @@ int cvmx_helper_get_interface_num(int ip
  
  	return -1;
  }
@@ -47,7 +47,7 @@
  
  /**
   * Returns the interface index number for an IPD/PKO port
-@@ -381,6 +383,7 @@
+@@ -381,6 +383,7 @@ int cvmx_helper_get_interface_num(int ip
   *
   * Returns Interface index number
   */
@@ -55,7 +55,7 @@
  int cvmx_helper_get_interface_index_num(int ipd_port)
  {
  	if (ipd_port < 32)
-@@ -395,6 +398,7 @@
+@@ -395,6 +398,7 @@ int cvmx_helper_get_interface_index_num(
  
  	return -1;
  }
@@ -63,9 +63,9 @@
  
  /**
   * Initialize the internal QLM JTAG logic to allow programming
---- a/arch/mips/include/asm/octeon/cvmx-helper-util.h	2009-05-06 17:31:46.000000000 +0200
-+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h	2009-05-06 17:27:36.000000000 +0200
-@@ -205,7 +205,7 @@
+--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
++++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
+@@ -205,7 +205,7 @@ static inline void cvmx_helper_free_pack
   *
   * Returns Interface number
   */
@@ -74,7 +74,7 @@
  
  /**
   * Returns the interface index number for an IPD/PKO port
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ extern int cvmx_helper_get_interface_num
   *
   * Returns Interface index number
   */
diff --git a/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch
deleted file mode 100644
index bc72185f28..0000000000
--- a/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Coly Li <coly.li@suse.de>
-Date: Wed, 22 Apr 2009 19:06:06 +0000 (+0800)
-Subject: MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
-X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=06a4801f5f580bb98dd813466668592943f7baea;hp=bb13f16bff55ce7ffb67d0d600bab72b9cab773b
-
-MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
-
-This patch modifies parameter of octeon_cvmcount_read() from 'void' to
-'struct clocksource *cs', which fixes compile warning for incompatible
-parameter type.
-
-Signed-off-by: Coly Li <coly.li@suse.de>
-Cc: David Daney <ddaney@caviumnetworks.com>
-Cc: Ingo Molnar <mingo@elte.hu>
-Reviewed-by: David Daney <ddaney@caviumnetworks.com>
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
-
-diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
-index 70fd92c..96110f2 100644
---- a/arch/mips/cavium-octeon/csrc-octeon.c
-+++ b/arch/mips/cavium-octeon/csrc-octeon.c
-@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
- 	local_irq_restore(flags);
- }
- 
--static cycle_t octeon_cvmcount_read(void)
-+static cycle_t octeon_cvmcount_read(struct clocksource *cs)
- {
- 	return read_c0_cvmcount();
- }
diff --git a/target/linux/cavium-octeon/patches/015-no_werror.patch b/target/linux/cavium-octeon/patches/015-no_werror.patch
index bb3b517788..71842dd1aa 100644
--- a/target/linux/cavium-octeon/patches/015-no_werror.patch
+++ b/target/linux/cavium-octeon/patches/015-no_werror.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/cavium-octeon/Makefile	2009-05-12 12:43:52.000000000 +0200
-+++ b/arch/mips/cavium-octeon/Makefile	2009-05-12 12:57:04.000000000 +0200
-@@ -18,5 +18,3 @@
+--- a/arch/mips/cavium-octeon/Makefile
++++ b/arch/mips/cavium-octeon/Makefile
+@@ -18,5 +18,3 @@ obj-$(CONFIG_PCI)                     +=
  obj-$(CONFIG_PCI)                     += pci.o
  obj-$(CONFIG_PCI)                     += pcie.o
  obj-$(CONFIG_PCI_MSI)                 += msi.o
diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile
index 9dbb38ef0a..eb0cd2b3ab 100644
--- a/target/linux/cobalt/Makefile
+++ b/target/linux/cobalt/Makefile
@@ -11,7 +11,7 @@ BOARD:=cobalt
 BOARDNAME:=Cobalt Microservers
 FEATURES:=tgz pci
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
index 4d021ff7c0..12f657ecc2 100644
--- a/target/linux/etrax/Makefile
+++ b/target/linux/etrax/Makefile
@@ -10,7 +10,7 @@ ARCH:=cris
 BOARD:=etrax
 BOARDNAME:=Foxboard (ETRAX 100LX)
 FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 DEVICE_TYPE=
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch
index bf43914f73..f837ff58fe 100644
--- a/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch
+++ b/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch
@@ -1,26 +1,26 @@
---- a/arch/cris/Makefile
-+++ b/arch/cris/Makefile
-@@ -40,7 +40,7 @@ endif
- 
- LD = $(CROSS_COMPILE)ld -mcrislinux
+--- a/arch/cris/boot/compressed/Makefile
++++ b/arch/cris/boot/compressed/Makefile
+@@ -18,7 +18,7 @@ ldflags-y += -T $(srctree)/$(src)/decomp
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
+ OBJECTS= $(OBJECTS-y) $(obj)/misc.o
+-OBJCOPYFLAGS = -O binary --remove-section=.bss
++#OBJCOPYFLAGS = -O binary --remove-section=.bss
  
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
+ quiet_cmd_image = BUILD   $@
+ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
+--- a/arch/cris/boot/Makefile
++++ b/arch/cris/boot/Makefile
+@@ -5,7 +5,7 @@
+ objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
+ objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
  
- CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
+-OBJCOPYFLAGS = -O binary $(objcopyflags-y)
++#OBJCOPYFLAGS = -O binary $(objcopyflags-y)
  
---- a/arch/cris/arch-v10/boot/Makefile
-+++ b/arch/cris/arch-v10/boot/Makefile
-@@ -2,8 +2,6 @@
- # arch/cris/arch-v10/boot/Makefile
- #
  
--OBJCOPYFLAGS = -O binary --remove-section=.bss
--
  subdir- := compressed rescue
- targets := Image
- 
-@@ -13,7 +11,7 @@ $(obj)/Image: vmlinux FORCE
+@@ -17,7 +17,7 @@ $(obj)/Image: vmlinux FORCE
  
  $(obj)/compressed/vmlinux: $(obj)/Image FORCE
  	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
@@ -29,23 +29,25 @@
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
  	@cp $< $@
---- a/arch/cris/arch-v10/boot/compressed/Makefile
-+++ b/arch/cris/arch-v10/boot/compressed/Makefile
-@@ -6,7 +6,6 @@ asflags-y += $(LINUXINCLUDE)
- ccflags-y += -O2 $(LINUXINCLUDE)
- ldflags-y += -T $(srctree)/$(src)/decompress.lds
- OBJECTS = $(obj)/head.o $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
+--- a/arch/cris/boot/rescue/Makefile
++++ b/arch/cris/boot/rescue/Makefile
+@@ -14,7 +14,7 @@ arch-$(CONFIG_ETRAX_ARCH_V10) = v10
+ arch-$(CONFIG_ETRAX_ARCH_V32) = v32
  
- quiet_cmd_image = BUILD   $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
---- a/arch/cris/arch-v10/boot/rescue/Makefile
-+++ b/arch/cris/arch-v10/boot/rescue/Makefile
-@@ -5,7 +5,6 @@
- ccflags-y += -O2 $(LINUXINCLUDE)
- asflags-y += $(LINUXINCLUDE)
- ldflags-y += -T $(srctree)/$(src)/rescue.lds
+ ldflags-y += -T $(srctree)/$(src)/rescue_$(arch-y).lds
 -OBJCOPYFLAGS = -O binary --remove-section=.bss
- obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
- OBJECT := $(obj)/head.o
++#OBJCOPYFLAGS = -O binary --remove-section=.bss
+ obj-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
+ obj-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
+ OBJECTS := $(obj-y)
+--- a/arch/cris/Makefile
++++ b/arch/cris/Makefile
+@@ -40,7 +40,7 @@ endif
+ 
+ LD = $(CROSS_COMPILE)ld -mcrislinux
+ 
+-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
++OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
+ 
+ CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
  
diff --git a/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch
index d04c2794d4..ef4f8e57dc 100644
--- a/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch
+++ b/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct 
+@@ -385,7 +385,7 @@ struct mtd_info *cfi_cmdset_0002(struct 
  
  		cfi_fixup_major_minor(cfi, extp);
  
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile
index 9b3a0de83c..b83bc4d5d2 100644
--- a/target/linux/gemini/Makefile
+++ b/target/linux/gemini/Makefile
@@ -10,9 +10,9 @@ ARCH:=arm
 BOARD:=gemini
 BOARDNAME:=Cortina Systems CS351x
 FEATURES:=jffs2 broken
-CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -mno-thumb-interwork -funit-at-a-time
+CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 201cd9f1e6..147a654b6c 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1370,6 +1370,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y
+# CONFIG_PAGE_SIZE_32KB is not set
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_PC is not set
diff --git a/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch b/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch
deleted file mode 100644
index a116cf437a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From: Ralf Baechle <ralf@linux-mips.org>
-Date: Thu, 30 Apr 2009 16:14:56 +0000 (+0200)
-Subject: MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
-X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=a1b68289997030df64cba8478d5767fe10e42a58
-
-MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
-
-The inline assembler used on 32-bit kernels was using the "h" constraint
-which was considered dangerous and removed for gcc 4.4.0.
-
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
-
-diff --git a/arch/mips/include/asm/div64.h b/arch/mips/include/asm/div64.h
-index d1d6991..dc5ea57 100644
---- a/arch/mips/include/asm/div64.h
-+++ b/arch/mips/include/asm/div64.h
-@@ -6,105 +6,63 @@
-  * License.  See the file "COPYING" in the main directory of this archive
-  * for more details.
-  */
--#ifndef _ASM_DIV64_H
--#define _ASM_DIV64_H
-+#ifndef __ASM_DIV64_H
-+#define __ASM_DIV64_H
- 
--#include <linux/types.h>
-+#include <asm-generic/div64.h>
- 
--#if (_MIPS_SZLONG == 32)
-+#if BITS_PER_LONG == 64
- 
--#include <asm/compiler.h>
-+#include <linux/types.h>
- 
- /*
-  * No traps on overflows for any of these...
-  */
- 
--#define do_div64_32(res, high, low, base) ({ \
--	unsigned long __quot32, __mod32; \
--	unsigned long __cf, __tmp, __tmp2, __i; \
--	\
--	__asm__(".set	push\n\t" \
--		".set	noat\n\t" \
--		".set	noreorder\n\t" \
--		"move	%2, $0\n\t" \
--		"move	%3, $0\n\t" \
--		"b	1f\n\t" \
--		" li	%4, 0x21\n" \
--		"0:\n\t" \
--		"sll	$1, %0, 0x1\n\t" \
--		"srl	%3, %0, 0x1f\n\t" \
--		"or	%0, $1, %5\n\t" \
--		"sll	%1, %1, 0x1\n\t" \
--		"sll	%2, %2, 0x1\n" \
--		"1:\n\t" \
--		"bnez	%3, 2f\n\t" \
--		" sltu	%5, %0, %z6\n\t" \
--		"bnez	%5, 3f\n" \
--		"2:\n\t" \
--		" addiu	%4, %4, -1\n\t" \
--		"subu	%0, %0, %z6\n\t" \
--		"addiu	%2, %2, 1\n" \
--		"3:\n\t" \
--		"bnez	%4, 0b\n\t" \
--		" srl	%5, %1, 0x1f\n\t" \
--		".set	pop" \
--		: "=&r" (__mod32), "=&r" (__tmp), \
--		  "=&r" (__quot32), "=&r" (__cf), \
--		  "=&r" (__i), "=&r" (__tmp2) \
--		: "Jr" (base), "0" (high), "1" (low)); \
--	\
--	(res) = __quot32; \
--	__mod32; })
--
--#define do_div(n, base) ({ \
--	unsigned long long __quot; \
--	unsigned long __mod; \
--	unsigned long long __div; \
--	unsigned long __upper, __low, __high, __base; \
--	\
--	__div = (n); \
--	__base = (base); \
--	\
--	__high = __div >> 32; \
--	__low = __div; \
--	__upper = __high; \
--	\
--	if (__high) \
--		__asm__("divu	$0, %z2, %z3" \
--			: "=h" (__upper), "=l" (__high) \
--			: "Jr" (__high), "Jr" (__base) \
--			: GCC_REG_ACCUM); \
--	\
--	__mod = do_div64_32(__low, __upper, __low, __base); \
--	\
--	__quot = __high; \
--	__quot = __quot << 32 | __low; \
--	(n) = __quot; \
--	__mod; })
--
--#endif /* (_MIPS_SZLONG == 32) */
--
--#if (_MIPS_SZLONG == 64)
--
--/*
-- * Hey, we're already 64-bit, no
-- * need to play games..
-- */
--#define do_div(n, base) ({ \
--	unsigned long __quot; \
--	unsigned int __mod; \
--	unsigned long __div; \
--	unsigned int __base; \
--	\
--	__div = (n); \
--	__base = (base); \
--	\
--	__mod = __div % __base; \
--	__quot = __div / __base; \
--	\
--	(n) = __quot; \
--	__mod; })
-+#define __div64_32(n, base)						\
-+({									\
-+	unsigned long __cf, __tmp, __tmp2, __i;				\
-+	unsigned long __quot32, __mod32;				\
-+	unsigned long __high, __low;					\
-+	unsigned long long __n;						\
-+									\
-+	__high = *__n >> 32;						\
-+	__low = __n;							\
-+	__asm__(							\
-+	"	.set	push					\n"	\
-+	"	.set	noat					\n"	\
-+	"	.set	noreorder				\n"	\
-+	"	move	%2, $0					\n"	\
-+	"	move	%3, $0					\n"	\
-+	"	b	1f					\n"	\
-+	"	 li	%4, 0x21				\n"	\
-+	"0:							\n"	\
-+	"	sll	$1, %0, 0x1				\n"	\
-+	"	srl	%3, %0, 0x1f				\n"	\
-+	"	or	%0, $1, %5				\n"	\
-+	"	sll	%1, %1, 0x1				\n"	\
-+	"	sll	%2, %2, 0x1				\n"	\
-+	"1:							\n"	\
-+	"	bnez	%3, 2f					\n"	\
-+	"	 sltu	%5, %0, %z6				\n"	\
-+	"	bnez	%5, 3f					\n"	\
-+	"2:							\n"	\
-+	"	 addiu	%4, %4, -1				\n"	\
-+	"	subu	%0, %0, %z6				\n"	\
-+	"	addiu	%2, %2, 1				\n"	\
-+	"3:							\n"	\
-+	"	bnez	%4, 0b\n\t"					\
-+	"	 srl	%5, %1, 0x1f\n\t"				\
-+	"	.set	pop"						\
-+	: "=&r" (__mod32), "=&r" (__tmp),				\
-+	  "=&r" (__quot32), "=&r" (__cf),				\
-+	  "=&r" (__i), "=&r" (__tmp2)					\
-+	: "Jr" (base), "0" (__high), "1" (__low));			\
-+									\
-+	(__n) = __quot32;						\
-+	__mod32;							\
-+})
- 
--#endif /* (_MIPS_SZLONG == 64) */
-+#endif /* BITS_PER_LONG == 64 */
- 
--#endif /* _ASM_DIV64_H */
-+#endif /* __ASM_DIV64_H */
diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
index 8424a7afca..3bd7a8fbb6 100644
--- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
@@ -1023,7 +1023,7 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
  	nf_conntrack_put(skb->nfct);
  	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -524,6 +610,9 @@ static void __copy_skb_header(struct sk_
+@@ -526,6 +612,9 @@ static void __copy_skb_header(struct sk_
  	new->sp			= secpath_get(old->sp);
  #endif
  	memcpy(new->cb, old->cb, sizeof(old->cb));
@@ -1033,7 +1033,7 @@
  	new->csum_start		= old->csum_start;
  	new->csum_offset	= old->csum_offset;
  	new->local_df		= old->local_df;
-@@ -2767,6 +2856,13 @@ void __init skb_init(void)
+@@ -2769,6 +2858,13 @@ void __init skb_init(void)
  						0,
  						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
  						NULL);
diff --git a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
index 739e972f71..dc6a14f1eb 100644
--- a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -602,6 +602,9 @@ else
+@@ -603,6 +603,9 @@ else
  load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000
  endif
  
diff --git a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
index f55ce346d9..fa891e0f3d 100644
--- a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
@@ -1,6 +1,6 @@
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -1211,7 +1211,7 @@ static unsigned long vma_dump_size(struc
+@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
  	if (FILTER(ELF_HEADERS) &&
  	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
  		u32 __user *header = (u32 __user *) vma->vm_start;
diff --git a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
index 85fa0d6fcb..869323fdb4 100644
--- a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
@@ -88,7 +88,7 @@
  /*********************************************************************
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
  	}
  	return ret;
  }
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 861d3be876..40c838363a 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -11,7 +11,7 @@ BOARD:=kirkwood
 BOARDNAME:=Marvell Kirkwood
 FEATURES:=jffs2 usb broken
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index dfc897a951..ab2c22d6fd 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -11,7 +11,7 @@ BOARD:=sibyte
 BOARDNAME:=Broadcom/SiByte SB-1
 FEATURES:=broken
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/sibyte/patches/003-fix_locking.patch b/target/linux/sibyte/patches/003-fix_locking.patch
deleted file mode 100644
index eaa70f6add..0000000000
--- a/target/linux/sibyte/patches/003-fix_locking.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Locking of irq_desc is now done in irq_set_affinity; Don't lock it
-again in chip specific set_affinity function.
-
-Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
----
-
- arch/mips/sibyte/bcm1480/irq.c |    7 ++-----
- arch/mips/sibyte/sb1250/irq.c  |    7 ++-----
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
-index 352352b..c147c4b 100644
---- a/arch/mips/sibyte/bcm1480/irq.c
-+++ b/arch/mips/sibyte/bcm1480/irq.c
-@@ -113,7 +113,6 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- {
- 	int i = 0, old_cpu, cpu, int_on, k;
- 	u64 cur_ints;
--	struct irq_desc *desc = irq_desc + irq;
- 	unsigned long flags;
- 	unsigned int irq_dirty;
- 
-@@ -127,8 +126,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- 	cpu = cpu_logical_map(i);
- 
- 	/* Protect against other affinity changers and IMR manipulation */
--	spin_lock_irqsave(&desc->lock, flags);
--	spin_lock(&bcm1480_imr_lock);
-+	spin_lock_irqsave(&bcm1480_imr_lock, flags);
- 
- 	/* Swizzle each CPU's IMR (but leave the IP selection alone) */
- 	old_cpu = bcm1480_irq_owner[irq];
-@@ -153,8 +151,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- 			____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
- 		}
- 	}
--	spin_unlock(&bcm1480_imr_lock);
--	spin_unlock_irqrestore(&desc->lock, flags);
-+	spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
- }
- #endif
- 
-diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
-index c08ff58..38cb998 100644
---- a/arch/mips/sibyte/sb1250/irq.c
-+++ b/arch/mips/sibyte/sb1250/irq.c
-@@ -107,7 +107,6 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- {
- 	int i = 0, old_cpu, cpu, int_on;
- 	u64 cur_ints;
--	struct irq_desc *desc = irq_desc + irq;
- 	unsigned long flags;
- 
- 	i = cpumask_first(mask);
-@@ -121,8 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- 	cpu = cpu_logical_map(i);
- 
- 	/* Protect against other affinity changers and IMR manipulation */
--	spin_lock_irqsave(&desc->lock, flags);
--	spin_lock(&sb1250_imr_lock);
-+	spin_lock_irqsave(&sb1250_imr_lock, flags);
- 
- 	/* Swizzle each CPU's IMR (but leave the IP selection alone) */
- 	old_cpu = sb1250_irq_owner[irq];
-@@ -144,8 +142,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- 		____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
- 					R_IMR_INTERRUPT_MASK));
- 	}
--	spin_unlock(&sb1250_imr_lock);
--	spin_unlock_irqrestore(&desc->lock, flags);
-+	spin_unlock_irqrestore(&sb1250_imr_lock, flags);
- }
- #endif
-