kernel: update 3.10 to 3.10.9
authorGabor Juhos <juhosg@openwrt.org>
Fri, 23 Aug 2013 17:31:04 +0000 (17:31 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Fri, 23 Aug 2013 17:31:04 +0000 (17:31 +0000)
Also refresh 3.10 patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37832

76 files changed:
include/kernel-version.mk
target/linux/ar71xx/Makefile
target/linux/ar71xx/patches-3.10/401-mtd-physmap-add-lock-unlock.patch
target/linux/ar71xx/patches-3.10/406-mtd-m25p80-allow-to-specify-max-read-size.patch
target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
target/linux/ar71xx/patches-3.10/412-mtd-m25p80-zero-partition-parser-data.patch
target/linux/ar71xx/patches-3.10/500-MIPS-fw-myloader.patch
target/linux/ar71xx/patches-3.10/623-MIPS-ath79-DIR505-support.patch
target/linux/atheros/patches-3.10/100-board.patch
target/linux/atheros/patches-3.10/101-early-printk-support.patch
target/linux/bcm53xx/Makefile
target/linux/brcm2708/Makefile
target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch
target/linux/brcm47xx/Makefile
target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
target/linux/brcm63xx/patches-3.10/034-MIPS-BCM63XX-select-BMIPS4350-and-default-to-2-CPUs-.patch
target/linux/brcm63xx/patches-3.10/035-MIPS-BCM63XX-select-BOOT_RAW.patch
target/linux/brcm63xx/patches-3.10/104-MIPS-bmips-merge-CPU-options-into-one-option.patch
target/linux/brcm63xx/patches-3.10/105-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch
target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
target/linux/brcm63xx/patches-3.10/412-MTD-physmap-allow-passing-pp_data.patch
target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch
target/linux/generic/patches-3.10/001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch
target/linux/generic/patches-3.10/025-bcma_backport.patch
target/linux/generic/patches-3.10/060-hso_devices.patch
target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch
target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch
target/linux/generic/patches-3.10/204-module_strip.patch
target/linux/generic/patches-3.10/220-gc_sections.patch
target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch
target/linux/generic/patches-3.10/259-regmap_dynamic.patch
target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch
target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch
target/linux/generic/patches-3.10/304-mips_disable_fpu.patch
target/linux/generic/patches-3.10/305-mips_module_reloc.patch
target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch
target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch
target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch
target/linux/generic/patches-3.10/531-debloat_lzma.patch
target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch
target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch
target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch
target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
target/linux/generic/patches-3.10/750-hostap_txpower.patch
target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch
target/linux/generic/patches-3.10/902-debloat_proc.patch
target/linux/generic/patches-3.10/941-ocf_20120127.patch
target/linux/generic/patches-3.10/950-vm_exports.patch
target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch
target/linux/imx23/patches/100-soc-audio-support.patch
target/linux/imx23/patches/101-soc-audio-dts.patch
target/linux/imx23/patches/105-imx23-dcp.patch
target/linux/imx23/patches/106-add-dcp-dts.patch
target/linux/imx23/patches/110-lradc-dts.patch
target/linux/imx6/Makefile
target/linux/ixp4xx/Makefile
target/linux/malta/Makefile
target/linux/mpc85xx/Makefile
target/linux/octeon/Makefile
target/linux/octeon/patches-3.10/0001-MIPS-Octeon-Fix-DT-pruning-bug-with-pip-ports.patch
target/linux/octeon/patches-3.10/0002-MIPS-Octeon-Enable-interfaces-on-EdgeRouter-Lite.patch
target/linux/octeon/patches-3.10/0003-staging-MIPS-add-Octeon-USB-HCD-support.patch
target/linux/octeon/patches-3.10/0004-fix_hcd.patch
target/linux/ramips/Makefile
target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
target/linux/ramips/patches-3.10/0006-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
target/linux/ramips/patches-3.10/0009-MIPS-ralink-add-support-for-reset-controller-API.patch
target/linux/realview/Makefile
target/linux/xburst/Makefile

index 02c5b39db7b65b0efec158b502775ed550b8884d..c8fa4011a1a0852ec552b86220567f72d0c2064e 100644 (file)
@@ -17,9 +17,6 @@ endif
 ifeq ($(LINUX_VERSION),3.9.11)
   LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
 endif
-ifeq ($(LINUX_VERSION),3.10.4)
-  LINUX_KERNEL_MD5SUM:=0378156d0a4ebf155d083531c3cb3826
-endif
 ifeq ($(LINUX_VERSION),3.10.9)
   LINUX_KERNEL_MD5SUM:=28d1e1117c30fdd861f70ac0f9b677aa
 endif
index 07e24eeebeacf53f7b8efd1d110390c53e7d580b..f32c6a3045b1123db60b256d15e5fc072fe40014 100644 (file)
@@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16
 CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -mno-branch-likely
 SUBTARGETS:=generic nand
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index 953ae58da3d764bd75bfec357e0ecbc7f0cb88e7..b8b4e67b15b501f9fc720230ca57fead82410cf3 100644 (file)
@@ -83,7 +83,7 @@
                        for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
 --- a/include/linux/mtd/physmap.h
 +++ b/include/linux/mtd/physmap.h
-@@ -26,6 +26,8 @@ struct physmap_flash_data {
+@@ -25,6 +25,8 @@ struct physmap_flash_data {
        unsigned int            width;
        int                     (*init)(struct platform_device *);
        void                    (*exit)(struct platform_device *);
index 8dfad61e63d43162de0c05d951349cec0b7296d6..442d1b76deb921da4acfeb77d71c97235f699eaf 100644 (file)
@@ -84,7 +84,7 @@
        mutex_unlock(&flash->lock);
  
        return 0;
-@@ -1021,6 +1044,12 @@ static int m25p_probe(struct spi_device
+@@ -1017,6 +1040,12 @@ static int m25p_probe(struct spi_device
                flash->mtd._unlock = m25p80_unlock;
        }
  
index dd38f0085c55b6dc10229a442e1a2af397da2639..5e7d627f42b9330834e13c19d1e02bb309885237 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -1121,7 +1121,9 @@ static int m25p_probe(struct spi_device
+@@ -1117,7 +1117,9 @@ static int m25p_probe(struct spi_device
        /* partitions should match sector boundaries; and it may be good to
         * use readonly partitions for writeprotected sectors (BP2..BP0).
         */
index abec9b5b407f140eef1ad9f43d3db89929a3d4f8..6d82f7b3b581de0079b7676dcea68b204822cb90 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -1071,6 +1071,7 @@ static int m25p_probe(struct spi_device
+@@ -1067,6 +1067,7 @@ static int m25p_probe(struct spi_device
        if (info->flags & M25P_NO_ERASE)
                flash->mtd.flags |= MTD_NO_ERASE;
  
index 999b46606234e2abb258418c9dba60584a8ec5fb..dff5fbe2bb650e832b42a5e74c0704700ddd6f7d 100644 (file)
@@ -10,7 +10,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -993,6 +993,9 @@ config MIPS_MSC
+@@ -998,6 +998,9 @@ config MIPS_MSC
  config MIPS_NILE4
        bool
  
index ee41f655cc1e10ea83382cfa6be7bd32e5b7a5d1..231b487b824d66f6712dd26263f2210205265991 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-3.10.4/arch/mips/ath79/Kconfig
-===================================================================
---- linux-3.10.4.orig/arch/mips/ath79/Kconfig  2013-08-04 19:08:12.739921385 +0200
-+++ linux-3.10.4/arch/mips/ath79/Kconfig       2013-08-04 19:09:15.379922883 +0200
-@@ -254,6 +254,16 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -254,6 +254,16 @@ config ATH79_MACH_WPE72
        select ATH79_DEV_USB
        select MYLOADER
  
@@ -19,11 +17,9 @@ Index: linux-3.10.4/arch/mips/ath79/Kconfig
  config ATH79_MACH_DIR_600_A1
        bool "D-Link DIR-600 A1/DIR-615 E4 support"
        select SOC_AR724X
-Index: linux-3.10.4/arch/mips/ath79/Makefile
-===================================================================
---- linux-3.10.4.orig/arch/mips/ath79/Makefile 2013-08-04 19:07:36.299920522 +0200
-+++ linux-3.10.4/arch/mips/ath79/Makefile      2013-08-04 19:09:42.363923523 +0200
-@@ -53,6 +53,7 @@
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -53,6 +53,7 @@ obj-$(CONFIG_ATH79_MACH_ARCHER_C7)   += ma
  obj-$(CONFIG_ATH79_MACH_AW_NR580)     += mach-aw-nr580.o
  obj-$(CONFIG_ATH79_MACH_CAP4200AG)    += mach-cap4200ag.o
  obj-$(CONFIG_ATH79_MACH_DB120)                += mach-db120.o
@@ -31,11 +27,9 @@ Index: linux-3.10.4/arch/mips/ath79/Makefile
  obj-$(CONFIG_ATH79_MACH_DIR_600_A1)   += mach-dir-600-a1.o
  obj-$(CONFIG_ATH79_MACH_DIR_615_C1)   += mach-dir-615-c1.o
  obj-$(CONFIG_ATH79_MACH_DIR_825_B1)   += mach-dir-825-b1.o
-Index: linux-3.10.4/arch/mips/ath79/machtypes.h
-===================================================================
---- linux-3.10.4.orig/arch/mips/ath79/machtypes.h      2013-08-04 19:08:12.739921385 +0200
-+++ linux-3.10.4/arch/mips/ath79/machtypes.h   2013-08-04 19:09:29.715923222 +0200
-@@ -37,6 +37,7 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -37,6 +37,7 @@ enum ath79_mach_type {
        ATH79_MACH_CARAMBOLA2,          /* 8devices Carambola2 */
        ATH79_MACH_DB120,               /* Atheros DB120 reference board */
        ATH79_MACH_PB44,                /* Atheros PB44 reference board */
index efbb811a08b9f85e90d8e2571b43fc62ff010e58..5fb3e00c0c0dd1fc8f6e386a3e07682c4252b5e3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -137,6 +137,19 @@ config BCM63XX
+@@ -138,6 +138,19 @@ config BCM63XX
        help
         Support for BCM63XX based boards
  
@@ -20,7 +20,7 @@
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K
-@@ -837,6 +850,7 @@ config NLM_XLP_BOARD
+@@ -838,6 +851,7 @@ config NLM_XLP_BOARD
  
  endchoice
  
index dc5f3a8dc88bd861cc24e67f7df6f3b7e0db7fb3..2346e24918ba9769efffca6afad2d80244d3d067 100644 (file)
@@ -58,7 +58,7 @@
  obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -147,6 +147,7 @@ config ATHEROS_AR231X
+@@ -148,6 +148,7 @@ config ATHEROS_AR231X
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select ARCH_REQUIRE_GPIOLIB
index 94961610628794166cd1a0a36f01172d993311bb..632b385f43a3b30e22ee4312db2bbb030e5319e6 100644 (file)
@@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM47xx/53xx with ARM CPU
 FEATURES:=squashfs usb pci pcie gpio
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index 5fc4e6b94a0b539113c02dd9ab29bdf7e39a3246..260237c431742d859509cc5d20456a6e64ab1707 100644 (file)
@@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM2708/BCM2835
 FEATURES:=ext4 audio usb usbgadget display gpio
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835
index d9264d3179b0dce80f6470135aab9ef97d9c97f7..9800298aa0d7b361c7303e7d4f4b67dc8ce91c72 100644 (file)
 +ENDPROC(__FIQ_Branch)
 --- a/arch/arm/kernel/fiq.c
 +++ b/arch/arm/kernel/fiq.c
-@@ -137,6 +137,7 @@ void disable_fiq(int fiq)
+@@ -145,6 +145,7 @@ void disable_fiq(int fiq)
  EXPORT_SYMBOL(set_fiq_handler);
  EXPORT_SYMBOL(__set_fiq_regs);        /* defined in fiqasm.S */
  EXPORT_SYMBOL(__get_fiq_regs);        /* defined in fiqasm.S */
index 3e79dc6846ab4a7a1b0d90fa1d84f019ef435a05..76994a161a90989f7d84b9d66d1378733b2f971c 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb pcmcia
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += swconfig kmod-switch kmod-diag wpad-mini nvram
index 0e0f8a3dfdafdfebc2ff8d9251dbf94b656f24e6..1db01f0cbbc2f0ad49396e1c48225bd68dcc8b13 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -117,7 +117,6 @@ config BCM47XX
+@@ -118,7 +118,6 @@ config BCM47XX
        select NO_EXCEPT_FILL
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
index 25fc44be75a097e7feb88f72f45a4cd80754b204..920bc39200c36f26a2824f329f15ef8fba0ab2f0 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -128,6 +128,8 @@ config BCM63XX
+@@ -129,6 +129,8 @@ config BCM63XX
        select DMA_NONCOHERENT
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
index d638ffc2eb5beabd5b601e23c5b3635a4d2822a1..c540536cd8edd2e855f3093fb19b12cc7c5fa9dd 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -123,6 +123,7 @@ config BCM47XX
+@@ -124,6 +124,7 @@ config BCM47XX
  
  config BCM63XX
        bool "Broadcom BCM63XX based boards"
index 75a4bcf8d5fed3503c9953537e412e948f03acb3..e33d94dc0cdccea3916a7b0abee7b21d99500efb 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -129,6 +129,7 @@ config BCM63XX
+@@ -130,6 +130,7 @@ config BCM63XX
        select DMA_NONCOHERENT
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
@@ -25,7 +25,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
        select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
        select NR_CPUS_DEFAULT_2
        select SYS_SUPPORTS_32BIT_KERNEL
-@@ -1447,41 +1448,21 @@ config CPU_CAVIUM_OCTEON
+@@ -1453,41 +1454,21 @@ config CPU_CAVIUM_OCTEON
          can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
          Full details can be found at http://www.caviumnetworks.com.
  
@@ -81,7 +81,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  config CPU_XLR
        bool "Netlogic XLR SoC"
-@@ -1562,14 +1543,25 @@ config CPU_LOONGSON1
+@@ -1568,14 +1549,25 @@ config CPU_LOONGSON1
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM
  
@@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  config SYS_HAS_CPU_LOONGSON2E
        bool
-@@ -1643,6 +1635,9 @@ config SYS_HAS_CPU_SB1
+@@ -1649,6 +1641,9 @@ config SYS_HAS_CPU_SB1
  config SYS_HAS_CPU_CAVIUM_OCTEON
        bool
  
index 8de9a351c051fe2babe7a8b0d78f617770232edd..cb09abcc2d2bc776df43d3456983e9de5f1bf3c7 100644 (file)
@@ -18,7 +18,7 @@ fix bmips selection
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -130,7 +130,6 @@ config BCM63XX
+@@ -131,7 +131,6 @@ config BCM63XX
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_BMIPS
index 0a6b8b6d0bfc4914ca8460ee9454782fd0d4b2f0..b5df076dbc09b86de54ed0eb4909ee91d2e04984 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device
+@@ -1088,7 +1088,8 @@ static int m25p_probe(struct spi_device
        /* partitions should match sector boundaries; and it may be good to
         * use readonly partitions for writeprotected sectors (BP2..BP0).
         */
index 8e981b38c4a1ef250cdd8fbff76a812e56011e47..7ac1b2fb10b0abd3a156c12277a74c476619bd59 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  /*
   * Write an address range to the flash chip.  Data must be written in
   * FLASH_PAGESIZE chunks.  The address range may be any size provided
-@@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device
+@@ -983,6 +1005,9 @@ static int m25p_probe(struct spi_device
                return -ENOMEM;
        }
  
index cb7e1399fc38f4d765c780dbbda7bf42e130448b..ae3006ccb97bc64cae42f41e0a4a7ea7da62dab0 100644 (file)
@@ -31,7 +31,7 @@ Subject: [PATCH 63/79] MTD: physmap: allow passing pp_data
  
 --- a/include/linux/mtd/physmap.h
 +++ b/include/linux/mtd/physmap.h
-@@ -32,6 +32,7 @@ struct physmap_flash_data {
+@@ -31,6 +31,7 @@ struct physmap_flash_data {
        char                    *probe_type;
        struct mtd_partition    *parts;
        const char * const      *part_probe_types;
index 75e31f9095b3f638dd4b880bf366c361ae698c7f..6818a4d9cc44c27e08011a3b5f9cefb393737c0c 100644 (file)
@@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device
+@@ -972,6 +972,9 @@ static int m25p_probe(struct spi_device
                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
        }
  
index 8920a9cff15d03e7dfe14aa37806d8dfd0ba606b..f91dbb5268a657bfc59c38490de4e14ab97d275e 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 
 --- a/arch/mips/kernel/unaligned.c
 +++ b/arch/mips/kernel/unaligned.c
-@@ -684,7 +684,8 @@ const int reg16to32[] = { 16, 17, 2, 3, 
+@@ -684,7 +684,8 @@ const int reg16to32[] = { 16, 17, 2, 3,
  /* Recode table from 16-bit STORE register notation to 32-bit GPR. */
  const int reg16to32st[] = { 0, 17, 2, 3, 4, 5, 6, 7 };
  
index b8a8692dc7c3ac0d609244c583cc1a7493721261..a4ae800b162b85294a743738f672a274075d282a 100644 (file)
@@ -66,7 +66,7 @@
  }
  EXPORT_SYMBOL_GPL(bcma_core_disable);
  
-@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device 
+@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device
        bcma_aread32(core, BCMA_IOCTL);
  
        bcma_awrite32(core, BCMA_RESET_CTL, 0);
        { "AT45DB011", 0xc, 256, 512, },
        { "AT45DB021", 0x14, 256, 1024, },
        { "AT45DB041", 0x1c, 256, 2048, },
-@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc 
+@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc
  {
        struct bcma_bus *bus = cc->core->bus;
        struct bcma_sflash *sflash = &cc->sflash;
index 9354ed5d627be6191e59e4b7966cd58e8d1b1bc9..fd7cab75509b6397beb25a2bb24b27001ac14e7e 100644 (file)
@@ -15,7 +15,7 @@
        {USB_DEVICE(0x0af0, 0xd155)},
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -1252,6 +1252,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1259,6 +1259,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                0 ),
  
index 958841da1af66d4388674faf2936c2b29acd0fc4..1d53a8d67272107258d4623a0c4b7aa9ad23a85e 100644 (file)
@@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  }
  
  int mips_dma_supported(struct device *dev, u64 mask)
-@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev, 
+@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev,
  {
        BUG_ON(direction == DMA_NONE);
  
index 42c8db3f92052bf395744f7cfd9883c3f71047b7..a20d3d96b83b8d84f032ba224c6b51effc7662e5 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -296,7 +296,7 @@ config MIPS_MALTA
+@@ -297,7 +297,7 @@ config MIPS_MALTA
        select CEVT_R4K
        select CSRC_R4K
        select CSRC_GIC
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        select GENERIC_ISA_DMA
        select HAVE_PCSPKR_PLATFORM
        select IRQ_CPU
-@@ -947,6 +947,10 @@ config FW_CFE
+@@ -948,6 +948,10 @@ config FW_CFE
  config ARCH_DMA_ADDR_T_64BIT
        def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  
index 0df3b80b848496acebfc4a1c7e35b8b9bc34ad9b..bc907982e34ad20cf52c8a3818a4032ed0477eee 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1430,6 +1430,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1431,6 +1431,7 @@ config CPU_CAVIUM_OCTEON
        select LIBFDT
        select USE_OF
        select USB_EHCI_BIG_ENDIAN_MMIO
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        help
          The Cavium Octeon processor is a highly integrated chip containing
          many ethernet hardware widgets for networking tasks. The processor
-@@ -1650,6 +1651,9 @@ config SYS_HAS_CPU_XLR
+@@ -1651,6 +1652,9 @@ config SYS_HAS_CPU_XLR
  config SYS_HAS_CPU_XLP
        bool
  
@@ -506,7 +506,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  
  void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
-@@ -154,8 +136,8 @@ void dma_free_noncoherent(struct device 
+@@ -154,8 +136,8 @@ void dma_free_noncoherent(struct device
  }
  EXPORT_SYMBOL(dma_free_noncoherent);
  
@@ -647,7 +647,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                         enum dma_data_direction direction)
-@@ -343,23 +224,10 @@ void dma_cache_sync(struct device *dev, 
+@@ -343,23 +224,10 @@ void dma_cache_sync(struct device *dev,
  
  EXPORT_SYMBOL(dma_cache_sync);
  
index 74a4254249682087e6e61e273b42af8a1ab67127..e4d5407c8e60f27f2d22bd06217b2b3f42091e5d 100644 (file)
@@ -78,7 +78,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #ifdef MODULE
  #define __MODULE_INFO(tag, name, info)                                          \
  static const char __UNIQUE_ID(name)[]                                   \
-@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]                        
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
    = __stringify(tag) "=" info
  #else  /* !MODULE */
  /* This struct is here for syntactic coherency, it is not used */
@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #endif
  #define __MODULE_PARM_TYPE(name, _type)                                         \
    __MODULE_INFO(parmtype, name##type, #name ":" _type)
-@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]                        
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
  /* One for each parameter, describing how to use it.  Some files do
     multiple of these per line, so can't just use MODULE_INFO. */
  #define MODULE_PARM_DESC(_parm, desc) \
index f541deb899be58e5a8892e84ad76f40e0a0d2fbd..54caa855c94a8a669bfdeaa475369146a63a1cb0 100644 (file)
                __stop_unwind_tab = .;
        }
  #endif
-@@ -162,24 +162,24 @@ SECTIONS
+@@ -179,24 +179,24 @@ SECTIONS
        }
        .init.arch.info : {
                __arch_info_begin = .;
index ff38fc6085f8a0738055ccee16d509dc0ba390ec..dc491ffebc62bf2c99a13f8ea036ed5d73240f05 100644 (file)
@@ -1,6 +1,6 @@
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
+@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
  
  quiet_cmd_lzma = LZMA    $@
  cmd_lzma = (cat $(filter-out FORCE,$^) | \
index 36e8b61c270e92f1437e9ebd40bf0c8b0fc4a3a2..5282b076c1f3b3aa46ca25004e4942c9e3f04c74 100644 (file)
@@ -31,7 +31,7 @@
        bool
 --- a/include/linux/regmap.h
 +++ b/include/linux/regmap.h
-@@ -45,7 +45,7 @@ struct reg_default {
+@@ -46,7 +46,7 @@ struct reg_default {
        unsigned int def;
  };
  
index de0f1ce178058c428777edab8f4724729252be99..de5e9b8e8d797d6acd91fc096e849fa2a499c27b 100644 (file)
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -895,9 +895,6 @@ config FW_ARC
+@@ -896,9 +896,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
-@@ -2391,6 +2388,18 @@ config USE_OF
+@@ -2396,6 +2393,18 @@ config USE_OF
        select OF_EARLY_FLATTREE
        select IRQ_DOMAIN
  
index 7f27548a73af627d1d80d4e54b32ddb458787fa4..7236218c2051a71b4ea9e39601a5bfacc727ed6c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -988,6 +988,10 @@ config SYNC_R4K
+@@ -993,6 +993,10 @@ config SYNC_R4K
  config MIPS_MACHINE
        def_bool n
  
index 8d69bf2e53828726908d0f60b9709853683fff5a..89e6edcf2eba3cb150031da475e04b532684105c 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 --
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -976,6 +976,17 @@ config I8259
+@@ -981,6 +981,17 @@ config I8259
  config MIPS_BONITO64
        bool
  
index ceae7fd0399b733ea5da5767e7b9bc400ca8a390..d8cd0e59cf3dc6eab9b8295ef63ed5c7b18a3d79 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-3.10/arch/mips/Makefile
-===================================================================
---- linux-3.10.orig/arch/mips/Makefile 2013-08-04 14:03:15.323485386 +0200
-+++ linux-3.10/arch/mips/Makefile      2013-08-04 14:03:15.379485387 +0200
-@@ -90,8 +90,13 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
  cflags-y                      += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
  cflags-y                      += -msoft-float
  LDFLAGS_vmlinux                       += -G 0 -static -n -nostdlib --gc-sections
@@ -16,11 +14,9 @@ Index: linux-3.10/arch/mips/Makefile
  
  ifndef CONFIG_FUNCTION_TRACER
  KBUILD_CFLAGS_KERNEL          += -ffunction-sections -fdata-sections
-Index: linux-3.10/arch/mips/include/asm/module.h
-===================================================================
---- linux-3.10.orig/arch/mips/include/asm/module.h     2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10/arch/mips/include/asm/module.h  2013-08-04 14:03:15.383485387 +0200
-@@ -11,6 +11,11 @@
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
        const struct exception_table_entry *dbe_start;
        const struct exception_table_entry *dbe_end;
        struct mips_hi16 *r_mips_hi16_list;
@@ -32,11 +28,9 @@ Index: linux-3.10/arch/mips/include/asm/module.h
  };
  
  typedef uint8_t Elf64_Byte;           /* Type for a 8-bit quantity.  */
-Index: linux-3.10/arch/mips/kernel/module.c
-===================================================================
---- linux-3.10.orig/arch/mips/kernel/module.c  2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10/arch/mips/kernel/module.c       2013-08-04 15:31:24.995611431 +0200
-@@ -42,14 +42,222 @@
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -42,14 +42,222 @@ struct mips_hi16 {
  static LIST_HEAD(dbe_list);
  static DEFINE_SPINLOCK(dbe_lock);
  
@@ -260,7 +254,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
  
  int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
  {
-@@ -63,8 +271,39 @@
+@@ -63,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo
        return 0;
  }
  
@@ -300,7 +294,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
        if (v % 4) {
                pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
                       me->name);
-@@ -72,14 +311,17 @@
+@@ -72,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo
        }
  
        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@@ -323,7 +317,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
  
        return 0;
  }
-@@ -286,11 +528,32 @@
+@@ -286,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr,
                list_add(&me->arch.dbe_list, &dbe_list);
                spin_unlock_irq(&dbe_lock);
        }
index e6056fa5c409f1181b854ef7187f1d1ece0249cf..981867742531547c11ed4ac124494f5820eae79a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
  
  #define __HAVE_ARCH_MEMSET
  extern void *memset(void *__s, int __c, size_t __count);
index 89e443708fbb3e9cdac36b58d63ba7738afc33eb..0f4c02779e7cdf0bd214b4adb296b4d7da3da5dc 100644 (file)
@@ -30,7 +30,7 @@
  /****************************************************************************/
  
  struct m25p {
-@@ -1022,7 +1028,7 @@ static int m25p_probe(struct spi_device 
+@@ -1018,7 +1024,7 @@ static int m25p_probe(struct spi_device
                flash->mtd._write = m25p80_write;
  
        /* prefer "small sector" erase if possible */
index 4767e769b6321a3a40ba2c74fc5ff3c4c5cf0d52..1b814e97fd6a0f8df6c8177f3d5677432e3ab4e7 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Charles Manning <cdhmanning@gmail.com>
  #include <linux/pagemap.h>
  #include <linux/mtd/mtd.h>
  #include <linux/interrupt.h>
-@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file 
+@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file
  static int yaffs_file_flush(struct file *file);
  #endif
  
index 7787d500a9470162bde5bf4e6f70d336de587e9d..1ca189d2eec994b0cfdbe18f16a8f971c540c289 100644 (file)
        result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags);
        if(memcmp(buffer,data,dev->data_bytes_per_chunk) ||
                tempTags.obj_id != tags->obj_id ||
-@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct 
+@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct
                 * lot of checks that are most likely not needed.
                 *
                 * Mods to the above
                 * rest of the block.
                 */
  
-@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct 
+@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct
  }
  
  
                                        /* Free chunks already includes softdeleted chunks.
                                         * How ever this chunk is going to soon be really deleted
                                         * which will increment free chunks.
-@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t 
+@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t
                                        NULL);
        if (!tn)
                return YAFFS_FAIL;
  #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
        else if (obj->short_name[0]) {
                yaffs_strcpy(name, obj->short_name);
-@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj, 
+@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj,
        if (valid & ATTR_MODE)
                obj->yst_mode = attr->ia_mode;
        if (valid & ATTR_UID)
  
        if (valid & ATTR_ATIME)
                obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj, 
+@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj,
  
        attr->ia_mode = obj->yst_mode;
        valid |= ATTR_MODE;
index 476f330ddbedd1cb707071b1ac0988bac2c680a9..81d19762d461a7090a202c9aef07b9bb039da21e 100644 (file)
@@ -8,7 +8,7 @@
  static struct proc_dir_entry *my_proc_entry;
  static struct proc_dir_entry *debug_proc_entry;
  
-@@ -3668,6 +3669,7 @@ static int yaffs_proc_write(struct file 
+@@ -3668,6 +3669,7 @@ static int yaffs_proc_write(struct file
  {
          return yaffs_proc_write_trace_options(file, buf, count, data);
  }
index 9f9690f1876625853681c0edcfc5086dc85af52c..aa3c49801636fef05b5bcc429ce31feccb43ef44 100644 (file)
  /* LzmaDecode
 --- a/lib/lzma/LzmaDec.c
 +++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
    p->needFlush = 0;
  }
  
  {
    UInt32 dicSize;
    Byte d;
-@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
    return SZ_OK;
  }
  
 -SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
--{
--  CLzmaProps propNew;
--  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
--  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
--  p->prop = propNew;
--  return SZ_OK;
--}
--
--SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
 +static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
  {
    CLzmaProps propNew;
--  SizeT dicBufSize;
    RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-   RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+   p->prop = propNew;
+   return SZ_OK;
+ }
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  SizeT dicBufSize;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
 -  dicBufSize = propNew.dicSize;
 -  if (p->dic == 0 || dicBufSize != p->dicBufSize)
 -  {
 -    }
 -  }
 -  p->dicBufSize = dicBufSize;
-   p->prop = propNew;
-   return SZ_OK;
- }
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
 --- a/include/linux/lzma/LzmaEnc.h
 +++ b/include/linux/lzma/LzmaEnc.h
 @@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
  void MatchFinder_Construct(CMatchFinder *p);
  
  /* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
      UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
      ISzAlloc *alloc);
  void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
  {
    memmove(p->bufferBase,
      p->buffer - p->keepSizeBefore,
-@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder 
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
    p->buffer = p->bufferBase + p->keepSizeBefore;
  }
  
index bcdc58fca85cb42dca2d9362d98ecf154b999c8c..a4331097f7bed21c2a990f26f2c4f022b3eef809 100644 (file)
@@ -30,7 +30,7 @@
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
+@@ -134,6 +134,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
index 7cb1e2af73b5e1cfcf6fbc05de01ddf81a2a37fb..ecd46b6a2b04405206ec884fb3260187e31934ad 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, 
+@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode,
                        sizeof(struct ct_iter_state));
  }
  
index 140889d8671cdbbd0bf4c187768cfb0ef0205a84..11595a18dac317e72b778dbc0f7947f2523dbf0b 100644 (file)
  
        counters = alloc_counters(table);
        if (IS_ERR(counters))
-@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
+@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
+                       ret = -EFAULT;
                        goto free_counters;
                }
++
 +              flags = e->ip.flags & IPT_F_MASK;
 +              if (copy_to_user(userptr + off
 +                               + offsetof(struct ipt_entry, ip.flags),
@@ -87,7 +88,6 @@
 +                      ret = -EFAULT;
 +                      goto free_counters;
 +              }
-+
                for (i = sizeof(struct ipt_entry);
                     i < e->target_offset;
-                    i += m->u.match_size) {
index 49986da1b2664337c9530db5e8568ec3bc370334..5f88e6b8b6a1a0940903dcf2a85a94301641f128 100644 (file)
@@ -25,7 +25,7 @@
          Ethernet bridge, which means that the different Ethernet segments it
 --- a/net/ipv6/Makefile
 +++ b/net/ipv6/Makefile
-@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o 
+@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o
  obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
  
  obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
index 88038d8b67ae05149d4675d66294e8e8bf9039aa..b3a6597a57d3bcfbd9870784ad4ce6d1a2d90706 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/netlink/af_netlink.c
 +++ b/net/netlink/af_netlink.c
-@@ -1503,27 +1503,7 @@ void netlink_detachskb(struct sock *sk, 
+@@ -1503,27 +1503,7 @@ void netlink_detachskb(struct sock *sk,
  
  static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
  {
index e27d0a04d6c0e6edbd61b70282ab86721d90bfd2..93ff7ba71d3bddd622b8c95c3d732ea74b9aefb4 100644 (file)
@@ -24,7 +24,7 @@ commont qdiscs.
        }
 --- a/net/sched/sch_fifo.c
 +++ b/net/sched/sch_fifo.c
-@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff 
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff
  
  static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
  {
index 0a5ca2659dd77177bef77aab2d4e60d613252b8f..0a933416720103807cefc2fa8b89aed3b3573136 100644 (file)
@@ -56,7 +56,7 @@
                err = -EINVAL;
 --- a/net/ipv4/fib_semantics.c
 +++ b/net/ipv4/fib_semantics.c
-@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX 
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
                .error  = -EINVAL,
                .scope  = RT_SCOPE_NOWHERE,
        },
index fc032a93c974de8eced6aadee70efb3c9c2f9824..768c80f73bab5bf819782682c5c8d26dbd10ee9c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t 
+@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t
                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)
index 898d15d110bbb223e756aaba3c830c168bbff06e..ff99832b9992009eccaf19912b45287fc298a33f 100644 (file)
@@ -15,7 +15,7 @@
        default y
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct 
+@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct
  DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
                                PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
  
index c94f9689dde278a6268550ad77cd414dcb18549d..67ea753a1067e72b6fda2a0fdd43cf91585f3606 100644 (file)
                         &fib_triestat_fops))
                goto out2;
  
-@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net 
+@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net
        return 0;
  
  out3:
index 1d56450ae7a4b203c3054281b8c09244b3e92aaa..a177fdeddadff326c582627254397296894c6689 100644 (file)
@@ -24,7 +24,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
-@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk 
+@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
  }
  #endif
  
index 993d384b284188bc87673dc04daa58d30092d506..c19c3320af04b75d0c9a4d431e065eb2ffe93c6c 100644 (file)
@@ -62,7 +62,7 @@
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1404,6 +1404,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc
        mmu_notifier_invalidate_range_end(mm, start, end);
        tlb_finish_mmu(&tlb, start, end);
  }
index ae81f3f384b5805ee64dcbadcaab38aaea1acf1e..c7eb4c1c61aed0e91c84568dfb8422359603a0c7 100644 (file)
@@ -62,7 +62,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
  {
 --- a/drivers/watchdog/mpcore_wdt.c
 +++ b/drivers/watchdog/mpcore_wdt.c
-@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct 
+@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct
  
        spin_lock(&wdt_lock);
        /* Assume prescale is set to 256 */
index 33a1ea43ff50778bd66a5e6cf5aa263e614d9443..ef07f92c783ca9e333f755ce01fcc61d5690e3a7 100644 (file)
@@ -1,5 +1,3 @@
-diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 2f45f00..8226a88 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -125,6 +125,7 @@ config SND_SOC_ALL_CODECS
@@ -20,8 +18,6 @@ index 2f45f00..8226a88 100644
  # Amp
  config SND_SOC_LM4857
        tristate
-diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index b9e41c9..e3b6654 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -118,6 +118,7 @@ snd-soc-wm9705-objs := wm9705.o
@@ -32,7 +28,7 @@ index b9e41c9..e3b6654 100644
  
  # Amp
  snd-soc-max9877-objs := max9877.o
-@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712)       += snd-soc-wm9712.o
+@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712)       += snd-soc-
  obj-$(CONFIG_SND_SOC_WM9713)  += snd-soc-wm9713.o
  obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o
  obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
@@ -40,9 +36,6 @@ index b9e41c9..e3b6654 100644
  
  # Amp
  obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
-diff --git a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
-new file mode 100644
-index 0000000..144b225
 --- /dev/null
 +++ b/sound/soc/codecs/mxs-builtin-codec.c
 @@ -0,0 +1,1128 @@
@@ -1174,9 +1167,6 @@ index 0000000..144b225
 +MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec Driver");
 +MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
 +MODULE_LICENSE("GPL");
-diff --git a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
-new file mode 100644
-index 0000000..75dee0b
 --- /dev/null
 +++ b/sound/soc/codecs/mxs-builtin-codec.h
 @@ -0,0 +1,825 @@
@@ -2005,8 +1995,6 @@ index 0000000..75dee0b
 +#define BV_AUDIOIN_ADCVOL_SELECT__MIC 0x00
 +
 +#endif /* __MXS_ADC_CODEC_H */
-diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
-index 78d321c..9b8dd7d 100644
 --- a/sound/soc/mxs/Kconfig
 +++ b/sound/soc/mxs/Kconfig
 @@ -18,3 +18,13 @@ config SND_SOC_MXS_SGTL5000
@@ -2023,11 +2011,9 @@ index 78d321c..9b8dd7d 100644
 +      help
 +        Say Y or M if you want to add support for codecs attached to
 +        the MXS SAIF interface.
-diff --git a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
-index 565b5b5..cd0cf16 100644
 --- a/sound/soc/mxs/Makefile
 +++ b/sound/soc/mxs/Makefile
-@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs.o snd-soc-mxs-pcm.o
+@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs
  snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
  
  obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o
@@ -2040,9 +2026,6 @@ index 565b5b5..cd0cf16 100644
 +obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-pcm.o
 +obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-dai.o
 +obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
-diff --git a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
-new file mode 100644
-index 0000000..088863e
 --- /dev/null
 +++ b/sound/soc/mxs/mxs-builtin-audio.c
 @@ -0,0 +1,120 @@
@@ -2166,9 +2149,6 @@ index 0000000..088863e
 +MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Machine Driver");
 +MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
 +MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
-new file mode 100644
-index 0000000..d12bde7
 --- /dev/null
 +++ b/sound/soc/mxs/mxs-builtin-dai.c
 @@ -0,0 +1,588 @@
@@ -2760,9 +2740,6 @@ index 0000000..d12bde7
 +MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec DAI Driver");
 +MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
 +MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
-new file mode 100644
-index 0000000..9f155df
 --- /dev/null
 +++ b/sound/soc/mxs/mxs-builtin-pcm.c
 @@ -0,0 +1,69 @@
@@ -2835,9 +2812,6 @@ index 0000000..9f155df
 +EXPORT_SYMBOL_GPL(mxs_adc_pcm_platform_unregister);
 +
 +MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
-new file mode 100644
-index 0000000..2fba109
 --- /dev/null
 +++ b/sound/soc/mxs/mxs-builtin-pcm.h
 @@ -0,0 +1,25 @@
index a93c937dc2d65e54b7c5122c08a703f564b7e384..924cbebb08b0c9f289f5f52c7063562cdbe5ae46 100644 (file)
@@ -1,6 +1,5 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts   2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts       2013-07-30 14:43:31.000000000 +0200
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
 @@ -84,6 +84,25 @@
                        usbphy0: usbphy@8007c000 {
                                status = "okay";
index cbc25a06b323139e6ca4936893ae6f27aefe5d83..ae74209775bf530503f80f55036b3896bf36d988 100644 (file)
@@ -1,10 +1,8 @@
-diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
-index dffb855..3e11215 100644
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -286,6 +286,16 @@ config CRYPTO_DEV_SAHARA
-          This option enables support for the SAHARA HW crypto accelerator
-          found in some Freescale i.MX chips.
+@@ -287,6 +287,16 @@ config CRYPTO_DEV_SAHARA
+         This option enables support for the SAHARA HW crypto accelerator
+         found in some Freescale i.MX chips.
  
 +config CRYPTO_DEV_DCP
 +       tristate "Support for the DCP engine"
@@ -17,13 +15,11 @@ index dffb855..3e11215 100644
 +         capabilities of the DCP co-processor
 +
  config CRYPTO_DEV_S5P
-        tristate "Support for Samsung S5PV210 crypto accelerator"
-        depends on ARCH_S5PV210
-diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
-index 38ce13d..b4946dd 100644
+       tristate "Support for Samsung S5PV210 crypto accelerator"
+       depends on ARCH_S5PV210
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
+@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += om
  obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
  obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
  obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
@@ -31,9 +27,6 @@ index 38ce13d..b4946dd 100644
  obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
  obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
  obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
-diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
-new file mode 100644
-index 0000000..eea194c
 --- /dev/null
 +++ b/drivers/crypto/dcp.c
 @@ -0,0 +1,925 @@
@@ -962,5 +955,3 @@ index 0000000..eea194c
 +MODULE_AUTHOR("Tobias Rauter <tobias.rau...@gmail.com>");
 +MODULE_DESCRIPTION("Freescale DCP Crypto Driver");
 +MODULE_LICENSE("GPL");
-
-
index 6d50df6005a07e8c15d2e622831bc9779e73e82d..ddb223c38c3e6cc688c472f64e0af8d89b8d24f2 100644 (file)
@@ -1,7 +1,6 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi
---- linux-3.10/arch/arm/boot/dts/imx23.dtsi    2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi        2013-08-03 11:15:59.000000000 +0200
-@@ -333,6 +333,7 @@
+--- a/arch/arm/boot/dts/imx23.dtsi
++++ b/arch/arm/boot/dts/imx23.dtsi
+@@ -337,6 +337,7 @@
  
                        dcp@80028000 {
                                reg = <0x80028000 0x2000>;
@@ -9,9 +8,8 @@ diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/d
                                status = "disabled";
                        };
  
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts   2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts       2013-08-02 12:30:07.000000000 +0200
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
 @@ -66,6 +66,12 @@
                                pinctrl-0 = <&spi2_pins_a>;
                                status = "okay";
index 936fac65b3512fc4fe478ce46656c1a9d3525467..a2b988695991070a5828dcb6eec8ddd215164ea7 100644 (file)
@@ -1,9 +1,8 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts   2013-07-08 23:35:34.000000000 +0200
-+++ linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts       2013-07-08 23:35:44.000000000 +0200
-@@ -90,6 +90,11 @@
-                       usbphy0: usbphy@8007c000 {
-                               status = "okay";
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -109,6 +109,11 @@
+                               dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+                               dma-names = "rx", "tx";
                        };
 +                      
 +                      lradc@80050000 {
index 5e697f5d626ed854b7df38992eec96b1c7f01314..d7ea910c572bfd28770f3d643e5c81fdf40b61bf 100644 (file)
@@ -13,7 +13,7 @@ FEATURES:=audio display gpio pcie usb usbgadget squashfs targz
 CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index 931b2e365dddc83f52d51982db9a7aa9a0eb389e..80c49e065436430a0efec837821268e73e3d551a 100644 (file)
@@ -13,7 +13,7 @@ FEATURES:=squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic harddisk
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index ba5e07124b9dbb69dc4b3fe44012e6a78e0cea9e..60861201969ce449acc9d0e80539ff91c5ccb187 100644 (file)
@@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64
 INITRAMFS_EXTRA_FILES:=
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 DEVICE_TYPE:=developerboard
 
index 6a7531077a7d2f4c96e6485a38e2a5647b41b106..077275fe3a36a079b4994f12b3a6118bc6e18dce 100644 (file)
@@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic p1020
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index ea005d01f6a49ace9476161d3d58a142f8e29860..903e83a963f54e7f0b84f782afa37a6d7628b371 100644 (file)
@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 pci usb
 CFLAGS:=-Os -pipe -march=octeon -fno-caller-saves
 MAINTAINER:=John Crispin <blogic@openwrt.org>
 
-LINUX_VERSION:=3.10
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 
index 6f1270020e556fea03323ac3310823d325c8f600..0a905d5c38d7ffd69bacf96411911481b30880f2 100644 (file)
@@ -24,11 +24,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/cavium-octeon/octeon-platform.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
-index 7b746e7..1830874 100644
 --- a/arch/mips/cavium-octeon/octeon-platform.c
 +++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac)
+@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(
        char name_buffer[20];
        int iface;
        int p;
@@ -41,6 +39,3 @@ index 7b746e7..1830874 100644
  
        snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
        iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
--- 
-1.7.10.4
-
index 030d1e2db1cf487069ed811b70043f9bf1fdd641..84b66006afed678b7f2ad7b90037fdf8b897f2d7 100644 (file)
@@ -19,11 +19,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/octeon/cvmx-bootinfo.h          |    2 ++
  2 files changed, 15 insertions(+)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-index 7c64977..0a1283c 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-@@ -181,6 +181,11 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
+@@ -181,6 +181,11 @@ int cvmx_helper_board_get_mii_address(in
                        return ipd_port - 16 + 4;
                else
                        return -1;
@@ -35,7 +33,7 @@ index 7c64977..0a1283c 100644
        }
  
        /* Some unknown board. Somebody forgot to update this function... */
-@@ -706,6 +711,14 @@ int __cvmx_helper_board_hardware_enable(int interface)
+@@ -706,6 +711,14 @@ int __cvmx_helper_board_hardware_enable(
                                }
                        }
                }
@@ -50,8 +48,6 @@ index 7c64977..0a1283c 100644
        }
        return 0;
  }
-diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-index 284fa8d..7b7818d 100644
 --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 @@ -227,6 +227,7 @@ enum cvmx_board_types_enum {
@@ -62,7 +58,7 @@ index 284fa8d..7b7818d 100644
        CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
  
        /* The remaining range is reserved for future use. */
-@@ -325,6 +326,7 @@ static inline const char *cvmx_board_type_to_string(enum
+@@ -325,6 +326,7 @@ static inline const char *cvmx_board_typ
  
                    /* Customer private range */
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
@@ -70,6 +66,3 @@ index 284fa8d..7b7818d 100644
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
        }
        return "Unsupported Board";
--- 
-1.7.10.4
-
index 260dc1b438bc895c7ebd4bb65fdd16a7b388625e..7f602585ca1b8bad5f521f46cdd23ec579055911 100644 (file)
@@ -60,8 +60,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  create mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h
  create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c
 
-diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 4464f26..f64b662 100644
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
 @@ -62,6 +62,8 @@ source "drivers/staging/line6/Kconfig"
@@ -73,8 +71,6 @@ index 4464f26..f64b662 100644
  source "drivers/staging/serqt_usb2/Kconfig"
  
  source "drivers/staging/vt6655/Kconfig"
-diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
-index f689b9d..1fb58a1 100644
 --- a/drivers/staging/Makefile
 +++ b/drivers/staging/Makefile
 @@ -25,6 +25,7 @@ obj-$(CONFIG_LINE6_USB)              += line6/
index e8cadbfb023f41af53ffeb796c2e739e9f8020e7..318e59cb3eb70e13a5bd869781b3ba1a5c3e2336 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
-===================================================================
---- linux-3.10.orig/drivers/staging/octeon-usb/octeon-hcd.c    2013-08-03 16:11:44.269610286 +0200
-+++ linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c 2013-08-04 13:18:54.011421971 +0200
-@@ -673,8 +673,9 @@
+--- a/drivers/staging/octeon-usb/octeon-hcd.c
++++ b/drivers/staging/octeon-usb/octeon-hcd.c
+@@ -673,8 +673,9 @@ static const struct hc_driver octeon_hc_
  };
  
  
@@ -13,7 +11,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
        int status;
        int usb_num = to_platform_device(dev)->id;
        int irq = platform_get_irq(to_platform_device(dev), 0);
-@@ -728,8 +729,9 @@
+@@ -728,8 +729,9 @@ static int octeon_usb_driver_probe(struc
        return 0;
  }
  
@@ -24,7 +22,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
        int status;
        struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct octeon_hcd *priv = hcd_to_octeon(hcd);
-@@ -748,30 +750,35 @@
+@@ -748,30 +750,35 @@ static int octeon_usb_driver_remove(stru
        return 0;
  }
  
@@ -72,7 +70,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
        /*
         * Only cn52XX and cn56XX have DWC_OTG USB hardware and the
         * IOB priority registers.  Under heavy network load USB
-@@ -792,37 +799,14 @@
+@@ -792,37 +799,14 @@ static int __init octeon_usb_module_init
                cvmx_write_csr(CVMX_IOB_N2C_L2C_PRI_CNT, pri_cnt.u64);
        }
  
index f9db8b5e6e1aea720dc82ea0fd71847f873fd1e1..b47749497b56deeade4fba91f8182e6cf4256833 100644 (file)
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a
 CFLAGS:=-Os -pipe -mno-branch-likely
 FEATURES:=squashfs gpio
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=\
index b48023dd29699dbdec75779289fc2990cd9c52ea..6826463266cf4c3026887f60c81aac771db6b67f 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
+@@ -922,10 +922,13 @@ static int m25p_probe(struct spi_device
        unsigned                        i;
        struct mtd_part_parser_data     ppdata;
        struct device_node __maybe_unused *np = spi->dev.of_node;
@@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  #endif
  
        /* Platform data helps sort out which chip type we have, as
-@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
+@@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device
  
        if (data && data->name)
                flash->mtd.name = data->name;
index dd1aca11976cdf7c37ae54198bd02d98cfefe74a..cd4f38f925531752321bfc50719b086e279101cd 100644 (file)
@@ -21,7 +21,7 @@ Cc: linux-gpio@vger.kernel.org
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -443,6 +443,7 @@ config RALINK
+@@ -444,6 +444,7 @@ config RALINK
        select SYS_HAS_EARLY_PRINTK
        select HAVE_MACH_CLKDEV
        select CLKDEV_LOOKUP
index d0f7f20b7eeb49fa690879324f7923b873e95826..c30a5ddd3d1ddb6b87b823528de0cc3d05a1e48a 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -373,6 +373,7 @@ config MACH_VR41XX
+@@ -374,6 +374,7 @@ config MACH_VR41XX
        select CSRC_R4K
        select SYS_HAS_CPU_VR41XX
        select ARCH_REQUIRE_GPIOLIB
index 684db705dcb092f70bb3d542dd7706a146913cbe..2ada5189337cfbac82586e2371241dd693ddf188 100644 (file)
@@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk
 CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 DEVICE_TYPE:=developerboard
 
index 0460fa5c1653e87ef0b1bf5029ff904a1ea2a551..1b527d0e42a10c6fbf61c91df62148d06e5c24a6 100644 (file)
@@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
 FEATURES:=targz ubifs audio
 SUBTARGETS:=qi_lb60 n516 n526 id800wt
 
-LINUX_VERSION:=3.10.4
+LINUX_VERSION:=3.10.9
 
 DEVICE_TYPE=other