diff -u linux-3.13.0/Makefile linux-3.13.0/Makefile --- linux-3.13.0/Makefile +++ linux-3.13.0/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 13 SUBLEVEL = 11 -EXTRAVERSION = -ckt21 +EXTRAVERSION = -ckt20 NAME = King of Alienated Frog Porn # *DOCUMENTATION* reverted: --- linux-3.13.0/arch/arm/boot/dts/dove.dtsi +++ linux-3.13.0.orig/arch/arm/boot/dts/dove.dtsi @@ -176,7 +176,7 @@ uart2: serial@12200 { compatible = "ns16550a"; + reg = <0x12000 0x100>; - reg = <0x12200 0x100>; reg-shift = <2>; interrupts = <9>; clocks = <&core_clk 0>; @@ -185,7 +185,7 @@ uart3: serial@12300 { compatible = "ns16550a"; + reg = <0x12100 0x100>; - reg = <0x12300 0x100>; reg-shift = <2>; interrupts = <10>; clocks = <&core_clk 0>; reverted: --- linux-3.13.0/arch/arm/include/asm/elf.h +++ linux-3.13.0.orig/arch/arm/include/asm/elf.h @@ -114,7 +114,7 @@ the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ +#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) -#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we reverted: --- linux-3.13.0/arch/arm/mach-s3c64xx/crag6410.h +++ linux-3.13.0.orig/arch/arm/mach-s3c64xx/crag6410.h @@ -14,7 +14,6 @@ #include #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START -#define BANFF_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) #define PCA935X_GPIO_BASE GPIO_BOARD_START #define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) reverted: --- linux-3.13.0/arch/arm/mach-s3c64xx/mach-crag6410.c +++ linux-3.13.0.orig/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -555,7 +555,6 @@ static struct wm831x_pdata crag_pmic_pdata = { .wm831x_num = 1, - .irq_base = BANFF_PMIC_IRQ_BASE, .gpio_base = BANFF_PMIC_GPIO_BASE, .soft_shutdown = true, diff -u linux-3.13.0/arch/arm64/boot/dts/apm-mustang.dts linux-3.13.0/arch/arm64/boot/dts/apm-mustang.dts --- linux-3.13.0/arch/arm64/boot/dts/apm-mustang.dts +++ linux-3.13.0/arch/arm64/boot/dts/apm-mustang.dts @@ -41,10 +41,6 @@ status = "ok"; }; -&sgenet1 { - status = "ok"; -}; - &xgenet { status = "ok"; }; diff -u linux-3.13.0/arch/arm64/boot/dts/apm-storm.dtsi linux-3.13.0/arch/arm64/boot/dts/apm-storm.dtsi --- linux-3.13.0/arch/arm64/boot/dts/apm-storm.dtsi +++ linux-3.13.0/arch/arm64/boot/dts/apm-storm.dtsi @@ -196,16 +196,6 @@ clock-output-names = "sge0clk"; }; - sge1clk: sge1clk@1f21c000 { - compatible = "apm,xgene-device-clock"; - #clock-cells = <1>; - clocks = <&socplldiv2 0>; - reg = <0x0 0x1f21c000 0x0 0x1000>; - reg-names = "csr-reg"; - csr-mask = <0xc>; - clock-output-names = "sge1clk"; - }; - xge0clk: xge0clk@1f61c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -652,7 +642,7 @@ }; sgenet0: ethernet@1f210000 { - compatible = "apm,xgene1-sgenet"; + compatible = "apm,xgene-enet"; status = "disabled"; reg = <0x0 0x1f210000 0x0 0xd100>, <0x0 0x1f200000 0x0 0Xc300>, @@ -665,24 +655,8 @@ phy-connection-type = "sgmii"; }; - sgenet1: ethernet@1f210030 { - compatible = "apm,xgene1-sgenet"; - status = "disabled"; - reg = <0x0 0x1f210030 0x0 0xd100>, - <0x0 0x1f200000 0x0 0Xc300>, - <0x0 0x1B000000 0x0 0X8000>; - reg-names = "enet_csr", "ring_csr", "ring_cmd"; - interrupts = <0x0 0xAC 0x4>, - <0x0 0xAD 0x4>; - port-id = <1>; - dma-coherent; - clocks = <&sge1clk 0>; - local-mac-address = [00 00 00 00 00 00]; - phy-connection-type = "sgmii"; - }; - xgenet: ethernet@1f610000 { - compatible = "apm,xgene1-xgenet"; + compatible = "apm,xgene-enet"; status = "disabled"; reg = <0x0 0x1f610000 0x0 0xd100>, <0x0 0x1f600000 0x0 0Xc300>, reverted: --- linux-3.13.0/arch/c6x/kernel/time.c +++ linux-3.13.0.orig/arch/c6x/kernel/time.c @@ -49,7 +49,7 @@ return (tsc * sched_clock_multiplier) >> SCHED_CLOCK_SHIFT; } +void time_init(void) -void __init time_init(void) { u64 tmp = (u64)NSEC_PER_SEC << SCHED_CLOCK_SHIFT; diff -u linux-3.13.0/arch/mips/power/hibernate.S linux-3.13.0/arch/mips/power/hibernate.S --- linux-3.13.0/arch/mips/power/hibernate.S +++ linux-3.13.0/arch/mips/power/hibernate.S @@ -30,8 +30,6 @@ END(swsusp_arch_suspend) LEAF(swsusp_arch_resume) - /* Avoid TLB mismatch during and after kernel resume */ - jal local_flush_tlb_all PTR_L t0, restore_pblist 0: PTR_L t1, PBE_ADDRESS(t0) /* source */ @@ -45,6 +43,7 @@ bne t1, t3, 1b PTR_L t0, PBE_NEXT(t0) bnez t0, 0b + jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ PTR_LA t0, saved_regs PTR_L ra, PT_R31(t0) PTR_L sp, PT_R29(t0) diff -u linux-3.13.0/arch/powerpc/kernel/cacheinfo.c linux-3.13.0/arch/powerpc/kernel/cacheinfo.c --- linux-3.13.0/arch/powerpc/kernel/cacheinfo.c +++ linux-3.13.0/arch/powerpc/kernel/cacheinfo.c @@ -62,22 +62,12 @@ }; /* These are used to index the cache_type_info array. */ -#define CACHE_TYPE_UNIFIED 0 /* cache-size, cache-block-size, etc. */ -#define CACHE_TYPE_UNIFIED_D 1 /* d-cache-size, d-cache-block-size, etc */ -#define CACHE_TYPE_INSTRUCTION 2 -#define CACHE_TYPE_DATA 3 +#define CACHE_TYPE_UNIFIED 0 +#define CACHE_TYPE_INSTRUCTION 1 +#define CACHE_TYPE_DATA 2 static const struct cache_type_info cache_type_info[] = { { - /* Embedded systems that use cache-size, cache-block-size, - * etc. for the Unified (typically L2) cache. */ - .name = "Unified", - .size_prop = "cache-size", - .line_size_props = { "cache-line-size", - "cache-block-size", }, - .nr_sets_prop = "cache-sets", - }, - { /* PowerPC Processor binding says the [di]-cache-* * must be equal on unified caches, so just use * d-cache properties. */ @@ -304,8 +294,7 @@ { struct cache *iter; - if (cache->type == CACHE_TYPE_UNIFIED || - cache->type == CACHE_TYPE_UNIFIED_D) + if (cache->type == CACHE_TYPE_UNIFIED) return cache; list_for_each_entry(iter, &cache_list, list) @@ -336,29 +325,16 @@ return of_get_property(np, "cache-unified", NULL); } -/* - * Unified caches can have two different sets of tags. Most embedded - * use cache-size, etc. for the unified cache size, but open firmware systems - * use d-cache-size, etc. Check on initialization for which type we have, and - * return the appropriate structure type. Assume it's embedded if it isn't - * open firmware. If it's yet a 3rd type, then there will be missing entries - * in /sys/devices/system/cpu/cpu0/cache/index2/, and this code will need - * to be extended further. - */ -static int cache_is_unified_d(const struct device_node *np) +static struct cache *cache_do_one_devnode_unified(struct device_node *node, + int level) { - return of_get_property(np, - cache_type_info[CACHE_TYPE_UNIFIED_D].size_prop, NULL) ? - CACHE_TYPE_UNIFIED_D : CACHE_TYPE_UNIFIED; -} + struct cache *cache; -/* - */ -static struct cache *cache_do_one_devnode_unified(struct device_node *node, int level) -{ pr_debug("creating L%d ucache for %s\n", level, node->full_name); - return new_cache(cache_is_unified_d(node), level, node); + cache = new_cache(CACHE_TYPE_UNIFIED, level, node); + + return cache; } static struct cache *cache_do_one_devnode_split(struct device_node *node, reverted: --- linux-3.13.0/arch/powerpc/lib/crtsavres.S +++ linux-3.13.0.orig/arch/powerpc/lib/crtsavres.S @@ -231,87 +231,6 @@ mr 1,11 blr -#ifdef CONFIG_ALTIVEC -/* Called with r0 pointing just beyond the end of the vector save area. */ - -_GLOBAL(_savevr_20) - li r11,-192 - stvx vr20,r11,r0 -_GLOBAL(_savevr_21) - li r11,-176 - stvx vr21,r11,r0 -_GLOBAL(_savevr_22) - li r11,-160 - stvx vr22,r11,r0 -_GLOBAL(_savevr_23) - li r11,-144 - stvx vr23,r11,r0 -_GLOBAL(_savevr_24) - li r11,-128 - stvx vr24,r11,r0 -_GLOBAL(_savevr_25) - li r11,-112 - stvx vr25,r11,r0 -_GLOBAL(_savevr_26) - li r11,-96 - stvx vr26,r11,r0 -_GLOBAL(_savevr_27) - li r11,-80 - stvx vr27,r11,r0 -_GLOBAL(_savevr_28) - li r11,-64 - stvx vr28,r11,r0 -_GLOBAL(_savevr_29) - li r11,-48 - stvx vr29,r11,r0 -_GLOBAL(_savevr_30) - li r11,-32 - stvx vr30,r11,r0 -_GLOBAL(_savevr_31) - li r11,-16 - stvx vr31,r11,r0 - blr - -_GLOBAL(_restvr_20) - li r11,-192 - lvx vr20,r11,r0 -_GLOBAL(_restvr_21) - li r11,-176 - lvx vr21,r11,r0 -_GLOBAL(_restvr_22) - li r11,-160 - lvx vr22,r11,r0 -_GLOBAL(_restvr_23) - li r11,-144 - lvx vr23,r11,r0 -_GLOBAL(_restvr_24) - li r11,-128 - lvx vr24,r11,r0 -_GLOBAL(_restvr_25) - li r11,-112 - lvx vr25,r11,r0 -_GLOBAL(_restvr_26) - li r11,-96 - lvx vr26,r11,r0 -_GLOBAL(_restvr_27) - li r11,-80 - lvx vr27,r11,r0 -_GLOBAL(_restvr_28) - li r11,-64 - lvx vr28,r11,r0 -_GLOBAL(_restvr_29) - li r11,-48 - lvx vr29,r11,r0 -_GLOBAL(_restvr_30) - li r11,-32 - lvx vr30,r11,r0 -_GLOBAL(_restvr_31) - li r11,-16 - lvx vr31,r11,r0 - blr - -#endif /* CONFIG_ALTIVEC */ - #else /* CONFIG_PPC64 */ .section ".text.save.restore","ax",@progbits @@ -437,111 +356,6 @@ mtlr r0 blr -#ifdef CONFIG_ALTIVEC -/* Called with r0 pointing just beyond the end of the vector save area. */ - -.globl _savevr_20 -_savevr_20: - li r12,-192 - stvx vr20,r12,r0 -.globl _savevr_21 -_savevr_21: - li r12,-176 - stvx vr21,r12,r0 -.globl _savevr_22 -_savevr_22: - li r12,-160 - stvx vr22,r12,r0 -.globl _savevr_23 -_savevr_23: - li r12,-144 - stvx vr23,r12,r0 -.globl _savevr_24 -_savevr_24: - li r12,-128 - stvx vr24,r12,r0 -.globl _savevr_25 -_savevr_25: - li r12,-112 - stvx vr25,r12,r0 -.globl _savevr_26 -_savevr_26: - li r12,-96 - stvx vr26,r12,r0 -.globl _savevr_27 -_savevr_27: - li r12,-80 - stvx vr27,r12,r0 -.globl _savevr_28 -_savevr_28: - li r12,-64 - stvx vr28,r12,r0 -.globl _savevr_29 -_savevr_29: - li r12,-48 - stvx vr29,r12,r0 -.globl _savevr_30 -_savevr_30: - li r12,-32 - stvx vr30,r12,r0 -.globl _savevr_31 -_savevr_31: - li r12,-16 - stvx vr31,r12,r0 - blr - -.globl _restvr_20 -_restvr_20: - li r12,-192 - lvx vr20,r12,r0 -.globl _restvr_21 -_restvr_21: - li r12,-176 - lvx vr21,r12,r0 -.globl _restvr_22 -_restvr_22: - li r12,-160 - lvx vr22,r12,r0 -.globl _restvr_23 -_restvr_23: - li r12,-144 - lvx vr23,r12,r0 -.globl _restvr_24 -_restvr_24: - li r12,-128 - lvx vr24,r12,r0 -.globl _restvr_25 -_restvr_25: - li r12,-112 - lvx vr25,r12,r0 -.globl _restvr_26 -_restvr_26: - li r12,-96 - lvx vr26,r12,r0 -.globl _restvr_27 -_restvr_27: - li r12,-80 - lvx vr27,r12,r0 -.globl _restvr_28 -_restvr_28: - li r12,-64 - lvx vr28,r12,r0 -.globl _restvr_29 -_restvr_29: - li r12,-48 - lvx vr29,r12,r0 -.globl _restvr_30 -_restvr_30: - li r12,-32 - lvx vr30,r12,r0 -.globl _restvr_31 -_restvr_31: - li r12,-16 - lvx vr31,r12,r0 - blr - -#endif /* CONFIG_ALTIVEC */ - #endif /* CONFIG_PPC64 */ #endif reverted: --- linux-3.13.0/arch/s390/kernel/suspend.c +++ linux-3.13.0.orig/arch/s390/kernel/suspend.c @@ -142,8 +142,6 @@ { unsigned long nosave_begin_pfn = PFN_DOWN(__pa(&__nosave_begin)); unsigned long nosave_end_pfn = PFN_DOWN(__pa(&__nosave_end)); - unsigned long eshared_pfn = PFN_DOWN(__pa(&_eshared)) - 1; - unsigned long stext_pfn = PFN_DOWN(__pa(&_stext)); /* Always save lowcore pages (LC protection might be enabled). */ if (pfn <= LC_PAGES) @@ -151,8 +149,6 @@ if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn) return 1; /* Skip memory holes and read-only pages (NSS, DCSS, ...). */ - if (pfn >= stext_pfn && pfn <= eshared_pfn) - return ipl_info.type == IPL_TYPE_NSS ? 1 : 0; if (tprot(PFN_PHYS(pfn))) return 1; return 0; diff -u linux-3.13.0/arch/s390/kvm/priv.c linux-3.13.0/arch/s390/kvm/priv.c --- linux-3.13.0/arch/s390/kvm/priv.c +++ linux-3.13.0/arch/s390/kvm/priv.c @@ -414,7 +414,6 @@ for (n = mem->count - 1; n > 0 ; n--) memcpy(&mem->vm[n], &mem->vm[n - 1], sizeof(mem->vm[0])); - memset(&mem->vm[0], 0, sizeof(mem->vm[0])); mem->vm[0].cpus_total = cpus; mem->vm[0].cpus_configured = cpus; mem->vm[0].cpus_standby = 0; reverted: --- linux-3.13.0/arch/x86/kernel/process.c +++ linux-3.13.0.orig/arch/x86/kernel/process.c @@ -398,52 +398,6 @@ default_idle(); } -/* - * Intel Core2 and older machines prefer MWAIT over HALT for C1. - * We can't rely on cpuidle installing MWAIT, because it will not load - * on systems that support only C1 -- so the boot default must be MWAIT. - * - * Some AMD machines are the opposite, they depend on using HALT. - * - * So for default C1, which is used during boot until cpuidle loads, - * use MWAIT-C1 on Intel HW that has it, else use HALT. - */ -static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c) -{ - if (c->x86_vendor != X86_VENDOR_INTEL) - return 0; - - if (!cpu_has(c, X86_FEATURE_MWAIT)) - return 0; - - return 1; -} - -/* - * MONITOR/MWAIT with no hints, used for default default C1 state. - * This invokes MWAIT with interrutps enabled and no flags, - * which is backwards compatible with the original MWAIT implementation. - */ - -static void mwait_idle(void) -{ - if (!current_set_polling_and_test()) { - if (static_cpu_has(X86_FEATURE_CLFLUSH_MONITOR)) { - mb(); - clflush((void *)¤t_thread_info()->flags); - mb(); - } - - __monitor((void *)¤t_thread_info()->flags, 0, 0); - if (!need_resched()) - __sti_mwait(0, 0); - else - local_irq_enable(); - } else - local_irq_enable(); - __current_clr_polling(); -} - void select_idle_routine(const struct cpuinfo_x86 *c) { #ifdef CONFIG_SMP @@ -457,9 +411,6 @@ /* E400: APIC timer interrupt does not wake up CPU from C1e */ pr_info("using AMD E400 aware idle routine\n"); x86_idle = amd_e400_idle; - } else if (prefer_mwait_c1_over_halt(c)) { - pr_info("using mwait in idle threads\n"); - x86_idle = mwait_idle; } else x86_idle = default_idle; } reverted: --- linux-3.13.0/arch/xtensa/Kconfig +++ linux-3.13.0.orig/arch/xtensa/Kconfig @@ -283,36 +283,6 @@ source "drivers/pci/hotplug/Kconfig" -config XTFPGA_LCD - bool "Enable XTFPGA LCD driver" - depends on XTENSA_PLATFORM_XTFPGA - default n - help - There's a 2x16 LCD on most of XTFPGA boards, kernel may output - progress messages there during bootup/shutdown. It may be useful - during board bringup. - - If unsure, say N. - -config XTFPGA_LCD_BASE_ADDR - hex "XTFPGA LCD base address" - depends on XTFPGA_LCD - default "0x0d0c0000" - help - Base address of the LCD controller inside KIO region. - Different boards from XTFPGA family have LCD controller at different - addresses. Please consult prototyping user guide for your board for - the correct address. Wrong address here may lead to hardware lockup. - -config XTFPGA_LCD_8BIT_ACCESS - bool "Use 8-bit access to XTFPGA LCD" - depends on XTFPGA_LCD - default n - help - LCD may be connected with 4- or 8-bit interface, 8-bit access may - only be used with 8-bit interface. Please consult prototyping user - guide for your board for the correct interface width. - endmenu menu "Executable file formats" diff -u linux-3.13.0/arch/xtensa/include/uapi/asm/unistd.h linux-3.13.0/arch/xtensa/include/uapi/asm/unistd.h --- linux-3.13.0/arch/xtensa/include/uapi/asm/unistd.h +++ linux-3.13.0/arch/xtensa/include/uapi/asm/unistd.h @@ -715,7 +715,7 @@ __SYSCALL(324, sys_name_to_handle_at, 5) #define __NR_open_by_handle_at 325 __SYSCALL(325, sys_open_by_handle_at, 3) -#define __NR_sync_file_range2 326 +#define __NR_sync_file_range 326 __SYSCALL(326, sys_sync_file_range2, 6) #define __NR_perf_event_open 327 __SYSCALL(327, sys_perf_event_open, 5) reverted: --- linux-3.13.0/arch/xtensa/platforms/iss/network.c +++ linux-3.13.0.orig/arch/xtensa/platforms/iss/network.c @@ -395,10 +395,10 @@ { struct iss_net_private* lp = (struct iss_net_private*) priv; + spin_lock(&lp->lock); + iss_net_poll(); - spin_lock(&lp->lock); - mod_timer(&lp->timer, jiffies + lp->timer_val); spin_unlock(&lp->lock); @@ -411,7 +411,7 @@ char addr[sizeof "255.255.255.255\0"]; int err; + spin_lock(&lp->lock); - spin_lock_bh(&lp->lock); if ((err = lp->tp.open(lp)) < 0) goto out; @@ -430,11 +430,9 @@ while ((err = iss_net_rx(dev)) > 0) ; + spin_lock(&opened_lock); - spin_unlock_bh(&lp->lock); - spin_lock_bh(&opened_lock); list_add(&lp->opened_list, &opened); + spin_unlock(&opened_lock); - spin_unlock_bh(&opened_lock); - spin_lock_bh(&lp->lock); init_timer(&lp->timer); lp->timer_val = ISS_NET_TIMER_VALUE; @@ -443,7 +441,7 @@ mod_timer(&lp->timer, jiffies + lp->timer_val); out: + spin_unlock(&lp->lock); - spin_unlock_bh(&lp->lock); return err; } @@ -452,7 +450,7 @@ struct iss_net_private *lp = netdev_priv(dev); printk("iss_net_close!\n"); netif_stop_queue(dev); + spin_lock(&lp->lock); - spin_lock_bh(&lp->lock); spin_lock(&opened_lock); list_del(&opened); @@ -462,17 +460,18 @@ lp->tp.close(lp); + spin_unlock(&lp->lock); - spin_unlock_bh(&lp->lock); return 0; } static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct iss_net_private *lp = netdev_priv(dev); + unsigned long flags; int len; netif_stop_queue(dev); + spin_lock_irqsave(&lp->lock, flags); - spin_lock_bh(&lp->lock); len = lp->tp.write(lp, &skb); @@ -494,7 +493,7 @@ printk(KERN_ERR "iss_net_start_xmit: failed(%d)\n", len); } + spin_unlock_irqrestore(&lp->lock, flags); - spin_unlock_bh(&lp->lock); dev_kfree_skb(skb); return NETDEV_TX_OK; @@ -533,9 +532,9 @@ struct iss_net_private *lp = netdev_priv(dev); struct sockaddr *hwaddr = addr; + spin_lock(&lp->lock); - spin_lock_bh(&lp->lock); memcpy(dev->dev_addr, hwaddr->sa_data, ETH_ALEN); + spin_unlock(&lp->lock); - spin_unlock_bh(&lp->lock); #endif return 0; @@ -605,14 +604,14 @@ *lp = ((struct iss_net_private) { .device_list = LIST_HEAD_INIT(lp->device_list), .opened_list = LIST_HEAD_INIT(lp->opened_list), + .lock = __SPIN_LOCK_UNLOCKED(lp.lock), .dev = dev, .index = index, //.fd = -1, .mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0 }, .have_mac = 0, + }); - }); - spin_lock_init(&lp->lock); /* * Try all transport protocols. * Note: more protocols can be added by adding '&& !X_init(lp, eth)'. reverted: --- linux-3.13.0/arch/xtensa/platforms/xtfpga/Makefile +++ linux-3.13.0.orig/arch/xtensa/platforms/xtfpga/Makefile @@ -6,5 +6,4 @@ # # Note 2! The CFLAGS definitions are in the main makefile... +obj-y = setup.o lcd.o -obj-y += setup.o -obj-$(CONFIG_XTFPGA_LCD) += lcd.o reverted: --- linux-3.13.0/arch/xtensa/platforms/xtfpga/include/platform/hardware.h +++ linux-3.13.0.orig/arch/xtensa/platforms/xtfpga/include/platform/hardware.h @@ -44,6 +44,9 @@ /* UART */ #define DUART16552_PADDR (XCHAL_KIO_PADDR + 0x0D050020) +/* LCD instruction and data addresses. */ +#define LCD_INSTR_ADDR ((char *)IOADDR(0x0D040000)) +#define LCD_DATA_ADDR ((char *)IOADDR(0x0D040004)) /* Misc. */ #define XTFPGA_FPGAREGS_VADDR IOADDR(0x0D020000) reverted: --- linux-3.13.0/arch/xtensa/platforms/xtfpga/include/platform/lcd.h +++ linux-3.13.0.orig/arch/xtensa/platforms/xtfpga/include/platform/lcd.h @@ -11,25 +11,10 @@ #ifndef __XTENSA_XTAVNET_LCD_H #define __XTENSA_XTAVNET_LCD_H -#ifdef CONFIG_XTFPGA_LCD /* Display string STR at position POS on the LCD. */ void lcd_disp_at_pos(char *str, unsigned char pos); /* Shift the contents of the LCD display left or right. */ void lcd_shiftleft(void); void lcd_shiftright(void); -#else -static inline void lcd_disp_at_pos(char *str, unsigned char pos) -{ -} - -static inline void lcd_shiftleft(void) -{ -} - -static inline void lcd_shiftright(void) -{ -} -#endif - #endif reverted: --- linux-3.13.0/arch/xtensa/platforms/xtfpga/lcd.c +++ linux-3.13.0.orig/arch/xtensa/platforms/xtfpga/lcd.c @@ -1,63 +1,50 @@ /* + * Driver for the LCD display on the Tensilica LX60 Board. - * Driver for the LCD display on the Tensilica XTFPGA board family. - * http://www.mytechcorp.com/cfdata/productFile/File1/MOC-16216B-B-A0A04.pdf * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * * Copyright (C) 2001, 2006 Tensilica Inc. - * Copyright (C) 2015 Cadence Design Systems Inc. */ +/* + * + * FIXME: this code is from the examples from the LX60 user guide. + * + * The lcd_pause function does busy waiting, which is probably not + * great. Maybe the code could be changed to use kernel timers, or + * change the hardware to not need to wait. + */ + -#include #include #include #include #include +#include +#define LCD_PAUSE_ITERATIONS 4000 -/* LCD instruction and data addresses. */ -#define LCD_INSTR_ADDR ((char *)IOADDR(CONFIG_XTFPGA_LCD_BASE_ADDR)) -#define LCD_DATA_ADDR (LCD_INSTR_ADDR + 4) - #define LCD_CLEAR 0x1 #define LCD_DISPLAY_ON 0xc /* 8bit and 2 lines display */ #define LCD_DISPLAY_MODE8BIT 0x38 -#define LCD_DISPLAY_MODE4BIT 0x28 #define LCD_DISPLAY_POS 0x80 #define LCD_SHIFT_LEFT 0x18 #define LCD_SHIFT_RIGHT 0x1c -static void lcd_put_byte(u8 *addr, u8 data) -{ -#ifdef CONFIG_XTFPGA_LCD_8BIT_ACCESS - ACCESS_ONCE(*addr) = data; -#else - ACCESS_ONCE(*addr) = data & 0xf0; - ACCESS_ONCE(*addr) = (data << 4) & 0xf0; -#endif -} - static int __init lcd_init(void) { + *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT; - ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT; mdelay(5); + *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT; - ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT; udelay(200); + *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT; - ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT; - udelay(50); -#ifndef CONFIG_XTFPGA_LCD_8BIT_ACCESS - ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE4BIT; - udelay(50); - lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_MODE4BIT); udelay(50); + *LCD_INSTR_ADDR = LCD_DISPLAY_ON; -#endif - lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_ON); udelay(50); + *LCD_INSTR_ADDR = LCD_CLEAR; - lcd_put_byte(LCD_INSTR_ADDR, LCD_CLEAR); mdelay(10); lcd_disp_at_pos("XTENSA LINUX", 0); return 0; @@ -65,10 +52,10 @@ void lcd_disp_at_pos(char *str, unsigned char pos) { + *LCD_INSTR_ADDR = LCD_DISPLAY_POS | pos; - lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_POS | pos); udelay(100); while (*str != 0) { + *LCD_DATA_ADDR = *str; - lcd_put_byte(LCD_DATA_ADDR, *str); udelay(200); str++; } @@ -76,13 +63,13 @@ void lcd_shiftleft(void) { + *LCD_INSTR_ADDR = LCD_SHIFT_LEFT; - lcd_put_byte(LCD_INSTR_ADDR, LCD_SHIFT_LEFT); udelay(50); } void lcd_shiftright(void) { + *LCD_INSTR_ADDR = LCD_SHIFT_RIGHT; - lcd_put_byte(LCD_INSTR_ADDR, LCD_SHIFT_RIGHT); udelay(50); } diff -u linux-3.13.0/debian.master/changelog linux-3.13.0/debian.master/changelog --- linux-3.13.0/debian.master/changelog +++ linux-3.13.0/debian.master/changelog @@ -1,256 +1,17 @@ -linux (3.13.0-56.93) trusty; urgency=low +linux (3.13.0-55.94) trusty; urgency=low [ Brad Figg ] * Release Tracking Bug - - LP: #1465798 + - LP: #1466237 - [ Upstream Kernel Changes ] + [ Andy Whitcroft ] - * net: eth: xgene: devm_ioremap() returns NULL on error - - LP: #1458042 - * drivers: net: xgene: fix new firmware backward compatibility with older - driver - - LP: #1458042 - * drivers: net: xgene: constify of_device_id array - - LP: #1458042 - * drivers: net: xgene: Add second SGMII based 1G interface - - LP: #1458042 - * net: phy: re-design phy_modes to be self-contained - - LP: #1458042 - * dtb: change binding name to match with newer firmware DT - - LP: #1458042 - * dtb: xgene: Add second SGMII based 1G interface node - - LP: #1458042 - * Btrfs: make xattr replace operations atomic - - LP: #1438501 - - CVE-2014-9710 - * cdc-acm: prevent infinite loop when parsing CDC headers. - - LP: #1460657 - * (upstream) libata: Blacklist queued TRIM on all Samsung 800-series - - LP: #1338706, #1449005 - * ahci: avoton port-disable reset-quirk - - LP: #1458617 - * xfs: avoid false quotacheck after unclean shutdown - - LP: #1461730 - * (upstream)[SCSI] Add timeout to avoid infinite command retry - - LP: #1449372 - * (upstream)scsi_lib: remove the description string in - scsi_io_completion() - - LP: #1449372 - * udf: Remove repeated loads blocksize - - LP: #1462173 - - CVE-2015-4167 - * udf: Check length of extended attributes and allocation descriptors - - LP: #1462173 - - CVE-2015-4167 - * vfs: read file_handle only once in handle_to_path - - LP: #1416503 - - CVE-2015-1420 - * ozwpan: Use unsigned ints to prevent heap overflow - - LP: #1463442 - - CVE-2015-4001 - * ozwpan: divide-by-zero leading to panic - - LP: #1463445 - - CVE-2015-4003 - * ozwpan: Use proper check to prevent heap overflow - - LP: #1463444 - - CVE-2015-4002 - * ozwpan: unchecked signed subtraction leads to DoS - - LP: #1463444 - - CVE-2015-4002 - * Input: elantech - add new icbody type - - LP: #1464490 - * Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe card - - LP: #1465796 - * power_supply: twl4030_madc: Check return value of power_supply_register - - LP: #1465796 - * power_supply: lp8788-charger: Fix leaked power supply on probe fail - - LP: #1465796 - * ARM: dts: dove: Fix uart[23] reg property - - LP: #1465796 - * xtensa: xtfpga: fix hardware lockup caused by LCD driver - - LP: #1465796 - * Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open() - - LP: #1465796 - * xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range - - LP: #1465796 - * KVM: s390: Zero out current VMDB of STSI before including level3 data. - - LP: #1465796 - * usb: musb: core: fix TX/RX endpoint order - - LP: #1465796 - * drm/radeon: fix doublescan modes (v2) - - LP: #1465796 - * usb: phy: Find the right match in devm_usb_phy_match - - LP: #1465796 - * tools lib traceevent kbuffer: Remove extra update to data pointer in - PADDING - - LP: #1465796 - * ring-buffer: Replace this_cpu_*() with __this_cpu_*() - - LP: #1465796 - * ASoC: wm8741: Fix rates constraints values - - LP: #1465796 - * cdc-wdm: fix endianness bug in debug statements - - LP: #1465796 - * staging: panel: fix lcd type - - LP: #1465796 - * UBI: account for bitflips in both the VID header and data - - LP: #1465796 - * UBI: fix out of bounds write - - LP: #1465796 - * UBI: initialize LEB number variable - - LP: #1465796 - * UBI: fix check for "too many bytes" - - LP: #1465796 - * ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore - - LP: #1465796 - * ASoC: davinci-evm: drop un-necessary remove function - - LP: #1465796 - * iscsi-target: Convert iscsi_thread_set usage to kthread.h - - LP: #1465796 - * Drivers: hv: vmbus: Don't wait after requesting offers - - LP: #1465796 - * Btrfs: fix log tree corruption when fs mounted with -o discard - - LP: #1465796 - * btrfs: don't accept bare namespace as a valid xattr - - LP: #1465796 - * ARM: 8320/1: fix integer overflow in ELF_ET_DYN_BASE - - LP: #1465796 - * rtlwifi: rtl8192cu: Add new USB ID - - LP: #1465796 - * MIPS: Hibernate: flush TLB entries earlier - - LP: #1465796 - * ASoC: cs4271: Increase delay time after reset - - LP: #1465796 - * stk1160: Make sure current buffer is released - - LP: #1465796 - * mnt: Improve the umount_tree flags - - LP: #1465796 - * ext4: make fsync to sync parent dir in no-journal for real this time - - LP: #1465796 - * Input: elantech - fix absolute mode setting on some ASUS laptops - - LP: #1465796 - * usb: define a generic USB_RESUME_TIMEOUT macro - - LP: #1465796 - * usb: host: xhci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: ehci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: uhci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: musb: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: isp116x: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: fotg210: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: fusbh200: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: oxu210hp: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: r8a66597: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: sl811: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: dwc2: hcd: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: isp1760: hcd: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: core: hub: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * iser-target: Fix possible deadlock in RDMA_CM connection error - - LP: #1465796 - * gpio: mvebu: Fix mask/unmask managment per irq chip type - - LP: #1465796 - * scsi: storvsc: Fix a bug in copy_from_bounce_buffer() - - LP: #1465796 - * ALSA: emu10k1: don't deadlock in proc-functions - - LP: #1465796 - * xtensa: ISS: fix locking in TAP network adapter - - LP: #1465796 - * s390/hibernate: fix save and restore of kernel text section - - LP: #1465796 - * Btrfs: fix inode eviction infinite loop after extent_same ioctl - - LP: #1465796 - * Btrfs: fix inode eviction infinite loop after cloning into it - - LP: #1465796 - * ACPICA: Utilities: split IO address types from data type models. - - LP: #1465796 - * drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - - LP: #1465796 - * target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling - - LP: #1465796 - * mm/hugetlb: use pmd_page() in follow_huge_pmd() - - LP: #1465796 - * fs/binfmt_elf.c: fix bug in loading of PIE binaries - - LP: #1465796 - * IB/core: disallow registering 0-sized memory region - - LP: #1465796 - * IB/core: don't disallow registering region starting at 0x0 - - LP: #1465796 - * ptrace: fix race between ptrace_resume() and wait_task_stopped() - - LP: #1465796 - * mvsas: fix panic on expander attached SATA devices - - LP: #1465796 - * drm/i915: cope with large i2c transfers - - LP: #1465796 - * RCU pathwalk breakage when running into a symlink overmounting - something - - LP: #1465796 - * compal-laptop: Check return value of power_supply_register - - LP: #1465796 - * sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve - power savings and to improve performance - - LP: #1465796 - * nfs: don't call blocking operations while !TASK_RUNNING - - LP: #1465796 - * nfs: fix high load average due to callback thread sleeping - - LP: #1465796 - * e1000: add dummy allocator to fix race condition between mtu change and - netpoll - - LP: #1465796 - * wl18xx: show rx_frames_per_rates as an array as it really is - - LP: #1465796 - * lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR - - LP: #1465796 - * driver core: bus: Goto appropriate labels on failure in bus_add_device - - LP: #1465796 - * C6x: time: Ensure consistency in __init - - LP: #1465796 - * crypto: omap-aes - Fix support for unequal lengths - - LP: #1465796 - * jhash: Update jhash_[321]words functions to use correct initval - - LP: #1465796 - * KVM: use slowpath for cross page cached accesses - - LP: #1465796 - * powerpc: Fix missing L2 cache size in /sys/devices/system/cpu - - LP: #1465796 - * NFS: fix BUG() crash in notify_change() with patch to chown_common() - - LP: #1465796 - * i2c: core: Export bus recovery functions - - LP: #1465796 - * IB/mlx4: Fix WQE LSO segment calculation - - LP: #1465796 - * mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit - architectures - - LP: #1465796 - * skbuff: Do not scrub skb mark within the same name space - - LP: #1465796 - * firmware/ihex2fw.c: restore missing default in switch statement - - LP: #1465796 - * memstick: mspro_block: add missing curly braces - - LP: #1465796 - * tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support - for O= option in Makefile - - LP: #1465796 - * ext4: fix data corruption caused by unwritten and delayed extents - - LP: #1465796 - * powerpc: Add vr save/restore functions - - LP: #1465796 - * Linux 3.13.11-ckt21 - - LP: #1465796 + * SAUCE: ensure that upper/lower layers are valid before checking + permissions + - LP: #1465998 - -- Brad Figg Tue, 16 Jun 2015 10:52:43 -0700 + -- Brad Figg Wed, 17 Jun 2015 14:58:16 -0700 linux (3.13.0-55.92) trusty; urgency=low diff -u linux-3.13.0/debian.master/control linux-3.13.0/debian.master/control --- linux-3.13.0/debian.master/control +++ linux-3.13.0/debian.master/control @@ -46,7 +46,7 @@ /usr/share/doc/linux-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-3.13.0-56 +Package: linux-headers-3.13.0-55 Architecture: all Multi-Arch: foreign Section: devel @@ -55,7 +55,7 @@ Description: Header files related to Linux kernel version 3.13.0 This package provides kernel header files for version 3.13.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details Package: linux-libc-dev Architecture: i386 amd64 armhf arm64 x32 powerpc ppc64el @@ -83,17 +83,17 @@ version locked tools (such as perf and x86_energy_perf_policy) for version PGKVER. -Package: linux-tools-3.13.0-56 +Package: linux-tools-3.13.0-55 Architecture: i386 amd64 armhf arm64 powerpc ppc64el Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 3.13.0-56 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-tools-3.13.0-56-. + You probabally want to install linux-tools-3.13.0-55-. Package: linux-cloud-tools-common Architecture: all @@ -108,19 +108,19 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version PGKVER. -Package: linux-cloud-tools-3.13.0-56 +Package: linux-cloud-tools-3.13.0-55 Architecture: i386 amd64 armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 3.13.0-56 on + version locked tools for cloud tools for version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-cloud-tools-3.13.0-56-. + You probabally want to install linux-cloud-tools-3.13.0-55-. -Package: linux-image-3.13.0-56-generic +Package: linux-image-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional @@ -129,7 +129,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -146,11 +146,11 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic +Package: linux-image-extra-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -167,20 +167,20 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic +Package: linux-headers-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-dbgsym +Package: linux-image-3.13.0-55-generic-dbgsym Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional @@ -196,25 +196,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic +Package: linux-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic +Package: linux-cloud-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic @@ -227,7 +227,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-generic-lpae +Package: linux-image-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional @@ -236,7 +236,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: flash-kernel [armhf] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic-lpae +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic-lpae Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -253,11 +253,11 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic-lpae +Package: linux-image-extra-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -274,20 +274,20 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic-lpae +Package: linux-headers-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-lpae-dbgsym +Package: linux-image-3.13.0-55-generic-lpae-dbgsym Architecture: armhf Section: devel Priority: optional @@ -303,25 +303,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic-lpae +Package: linux-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic-lpae +Package: linux-cloud-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic-lpae @@ -334,7 +334,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-lowlatency +Package: linux-image-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional @@ -343,7 +343,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-lowlatency +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-lowlatency Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -360,11 +360,11 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-lowlatency +Package: linux-image-extra-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -381,20 +381,20 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-lowlatency +Package: linux-headers-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-lowlatency-dbgsym +Package: linux-image-3.13.0-55-lowlatency-dbgsym Architecture: i386 amd64 Section: devel Priority: optional @@ -410,25 +410,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-lowlatency +Package: linux-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-lowlatency +Package: linux-cloud-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-lowlatency @@ -441,7 +441,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-emb +Package: linux-image-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional @@ -450,7 +450,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-emb +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-emb Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -467,11 +467,11 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-emb +Package: linux-image-extra-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -488,20 +488,20 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-emb +Package: linux-headers-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP Book3E This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP Book3E. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-emb-dbgsym +Package: linux-image-3.13.0-55-powerpc64-emb-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -517,25 +517,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-emb +Package: linux-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-emb +Package: linux-cloud-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-emb @@ -548,7 +548,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-smp +Package: linux-image-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional @@ -557,7 +557,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-smp Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP. @@ -574,11 +574,11 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-smp +Package: linux-image-extra-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP. @@ -595,20 +595,20 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-smp +Package: linux-headers-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc64-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -624,25 +624,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-smp +Package: linux-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-smp +Package: linux-cloud-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-smp @@ -655,7 +655,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500 +Package: linux-image-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional @@ -664,7 +664,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500 +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500 Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -681,11 +681,11 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500 +Package: linux-image-extra-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -702,20 +702,20 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500 +Package: linux-headers-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -731,25 +731,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500 +Package: linux-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500 +Package: linux-cloud-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500 @@ -762,7 +762,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500mc +Package: linux-image-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional @@ -771,7 +771,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500mc +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500mc Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -788,11 +788,11 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500mc +Package: linux-image-extra-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -809,20 +809,20 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500mc +Package: linux-headers-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500mc This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500mc. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500mc-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500mc-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -838,25 +838,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500mc +Package: linux-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500mc +Package: linux-cloud-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500mc @@ -869,7 +869,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-smp +Package: linux-image-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional @@ -878,7 +878,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-smp Description: Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP. @@ -895,11 +895,11 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-smp +Package: linux-image-extra-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP. @@ -916,20 +916,20 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-smp +Package: linux-headers-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 32-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -945,25 +945,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-smp +Package: linux-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-smp +Package: linux-cloud-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-smp diff -u linux-3.13.0/debian.master/control.stub linux-3.13.0/debian.master/control.stub --- linux-3.13.0/debian.master/control.stub +++ linux-3.13.0/debian.master/control.stub @@ -46,7 +46,7 @@ /usr/share/doc/linux-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-3.13.0-56 +Package: linux-headers-3.13.0-55 Architecture: all Multi-Arch: foreign Section: devel @@ -55,7 +55,7 @@ Description: Header files related to Linux kernel version 3.13.0 This package provides kernel header files for version 3.13.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details Package: linux-libc-dev Architecture: i386 amd64 armhf arm64 x32 powerpc ppc64el @@ -83,17 +83,17 @@ version locked tools (such as perf and x86_energy_perf_policy) for version PGKVER. -Package: linux-tools-3.13.0-56 +Package: linux-tools-3.13.0-55 Architecture: i386 amd64 armhf arm64 powerpc ppc64el Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 3.13.0-56 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-tools-3.13.0-56-. + You probabally want to install linux-tools-3.13.0-55-. Package: linux-cloud-tools-common Architecture: all @@ -108,19 +108,19 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version PGKVER. -Package: linux-cloud-tools-3.13.0-56 +Package: linux-cloud-tools-3.13.0-55 Architecture: i386 amd64 armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 3.13.0-56 on + version locked tools for cloud tools for version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-cloud-tools-3.13.0-56-. + You probabally want to install linux-cloud-tools-3.13.0-55-. -Package: linux-image-3.13.0-56-generic +Package: linux-image-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional @@ -129,7 +129,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -146,11 +146,11 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic +Package: linux-image-extra-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -167,20 +167,20 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic +Package: linux-headers-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-dbgsym +Package: linux-image-3.13.0-55-generic-dbgsym Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional @@ -196,25 +196,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic +Package: linux-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic +Package: linux-cloud-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic @@ -227,7 +227,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-generic-lpae +Package: linux-image-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional @@ -236,7 +236,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: flash-kernel [armhf] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic-lpae +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic-lpae Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -253,11 +253,11 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic-lpae +Package: linux-image-extra-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -274,20 +274,20 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic-lpae +Package: linux-headers-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-lpae-dbgsym +Package: linux-image-3.13.0-55-generic-lpae-dbgsym Architecture: armhf Section: devel Priority: optional @@ -303,25 +303,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic-lpae +Package: linux-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic-lpae +Package: linux-cloud-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic-lpae @@ -334,7 +334,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-lowlatency +Package: linux-image-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional @@ -343,7 +343,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-lowlatency +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-lowlatency Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -360,11 +360,11 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-lowlatency +Package: linux-image-extra-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -381,20 +381,20 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-lowlatency +Package: linux-headers-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-lowlatency-dbgsym +Package: linux-image-3.13.0-55-lowlatency-dbgsym Architecture: i386 amd64 Section: devel Priority: optional @@ -410,25 +410,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-lowlatency +Package: linux-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-lowlatency +Package: linux-cloud-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-lowlatency @@ -441,7 +441,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-emb +Package: linux-image-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional @@ -450,7 +450,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-emb +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-emb Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -467,11 +467,11 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-emb +Package: linux-image-extra-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -488,20 +488,20 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-emb +Package: linux-headers-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP Book3E This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP Book3E. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-emb-dbgsym +Package: linux-image-3.13.0-55-powerpc64-emb-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -517,25 +517,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-emb +Package: linux-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-emb +Package: linux-cloud-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-emb @@ -548,7 +548,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-smp +Package: linux-image-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional @@ -557,7 +557,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-smp Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP. @@ -574,11 +574,11 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-smp +Package: linux-image-extra-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP. @@ -595,20 +595,20 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-smp +Package: linux-headers-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc64-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -624,25 +624,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-smp +Package: linux-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-smp +Package: linux-cloud-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-smp @@ -655,7 +655,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500 +Package: linux-image-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional @@ -664,7 +664,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500 +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500 Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -681,11 +681,11 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500 +Package: linux-image-extra-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -702,20 +702,20 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500 +Package: linux-headers-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -731,25 +731,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500 +Package: linux-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500 +Package: linux-cloud-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500 @@ -762,7 +762,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500mc +Package: linux-image-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional @@ -771,7 +771,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500mc +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500mc Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -788,11 +788,11 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500mc +Package: linux-image-extra-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -809,20 +809,20 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500mc +Package: linux-headers-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500mc This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500mc. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500mc-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500mc-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -838,25 +838,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500mc +Package: linux-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500mc +Package: linux-cloud-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500mc @@ -869,7 +869,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-smp +Package: linux-image-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional @@ -878,7 +878,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-smp Description: Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP. @@ -895,11 +895,11 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-smp +Package: linux-image-extra-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP. @@ -916,20 +916,20 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-smp +Package: linux-headers-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 32-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -945,25 +945,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-smp +Package: linux-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-smp +Package: linux-cloud-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-smp diff -u linux-3.13.0/debian.master/d-i/kernel-versions linux-3.13.0/debian.master/d-i/kernel-versions --- linux-3.13.0/debian.master/d-i/kernel-versions +++ linux-3.13.0/debian.master/d-i/kernel-versions @@ -2,18 +2,18 @@ -amd64 3.13.0-56 generic 3.13.0-56-generic - +amd64 3.13.0-55 generic 3.13.0-55-generic - -i386 3.13.0-56 generic 3.13.0-56-generic - +i386 3.13.0-55 generic 3.13.0-55-generic - -armhf 3.13.0-56 generic 3.13.0-56-generic - +armhf 3.13.0-55 generic 3.13.0-55-generic - -armhf 3.13.0-56 generic-lpae 3.13.0-56-generic-lpae - +armhf 3.13.0-55 generic-lpae 3.13.0-55-generic-lpae - -arm64 3.13.0-56 generic 3.13.0-56-generic - +arm64 3.13.0-55 generic 3.13.0-55-generic - -ppc64el 3.13.0-56 generic 3.13.0-56-generic - +ppc64el 3.13.0-55 generic 3.13.0-55-generic - # Ports # arch version flavour installedname suffix bdep -powerpc 3.13.0-56 powerpc-smp 3.13.0-56-powerpc-smp - -powerpc 3.13.0-56 powerpc64-smp 3.13.0-56-powerpc64-smp - -powerpc 3.13.0-56 powerpc-e500 3.13.0-56-powerpc-e500 - -powerpc 3.13.0-56 powerpc-e500mc 3.13.0-56-powerpc-e500mc - +powerpc 3.13.0-55 powerpc-smp 3.13.0-55-powerpc-smp - +powerpc 3.13.0-55 powerpc64-smp 3.13.0-55-powerpc64-smp - +powerpc 3.13.0-55 powerpc-e500 3.13.0-55-powerpc-e500 - +powerpc 3.13.0-55 powerpc-e500mc 3.13.0-55-powerpc-e500mc - diff -u linux-3.13.0/debian/changelog linux-3.13.0/debian/changelog --- linux-3.13.0/debian/changelog +++ linux-3.13.0/debian/changelog @@ -1,256 +1,17 @@ -linux (3.13.0-56.93) trusty; urgency=low +linux (3.13.0-55.94) trusty; urgency=low [ Brad Figg ] * Release Tracking Bug - - LP: #1465798 + - LP: #1466237 - [ Upstream Kernel Changes ] + [ Andy Whitcroft ] - * net: eth: xgene: devm_ioremap() returns NULL on error - - LP: #1458042 - * drivers: net: xgene: fix new firmware backward compatibility with older - driver - - LP: #1458042 - * drivers: net: xgene: constify of_device_id array - - LP: #1458042 - * drivers: net: xgene: Add second SGMII based 1G interface - - LP: #1458042 - * net: phy: re-design phy_modes to be self-contained - - LP: #1458042 - * dtb: change binding name to match with newer firmware DT - - LP: #1458042 - * dtb: xgene: Add second SGMII based 1G interface node - - LP: #1458042 - * Btrfs: make xattr replace operations atomic - - LP: #1438501 - - CVE-2014-9710 - * cdc-acm: prevent infinite loop when parsing CDC headers. - - LP: #1460657 - * (upstream) libata: Blacklist queued TRIM on all Samsung 800-series - - LP: #1338706, #1449005 - * ahci: avoton port-disable reset-quirk - - LP: #1458617 - * xfs: avoid false quotacheck after unclean shutdown - - LP: #1461730 - * (upstream)[SCSI] Add timeout to avoid infinite command retry - - LP: #1449372 - * (upstream)scsi_lib: remove the description string in - scsi_io_completion() - - LP: #1449372 - * udf: Remove repeated loads blocksize - - LP: #1462173 - - CVE-2015-4167 - * udf: Check length of extended attributes and allocation descriptors - - LP: #1462173 - - CVE-2015-4167 - * vfs: read file_handle only once in handle_to_path - - LP: #1416503 - - CVE-2015-1420 - * ozwpan: Use unsigned ints to prevent heap overflow - - LP: #1463442 - - CVE-2015-4001 - * ozwpan: divide-by-zero leading to panic - - LP: #1463445 - - CVE-2015-4003 - * ozwpan: Use proper check to prevent heap overflow - - LP: #1463444 - - CVE-2015-4002 - * ozwpan: unchecked signed subtraction leads to DoS - - LP: #1463444 - - CVE-2015-4002 - * Input: elantech - add new icbody type - - LP: #1464490 - * Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe card - - LP: #1465796 - * power_supply: twl4030_madc: Check return value of power_supply_register - - LP: #1465796 - * power_supply: lp8788-charger: Fix leaked power supply on probe fail - - LP: #1465796 - * ARM: dts: dove: Fix uart[23] reg property - - LP: #1465796 - * xtensa: xtfpga: fix hardware lockup caused by LCD driver - - LP: #1465796 - * Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open() - - LP: #1465796 - * xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range - - LP: #1465796 - * KVM: s390: Zero out current VMDB of STSI before including level3 data. - - LP: #1465796 - * usb: musb: core: fix TX/RX endpoint order - - LP: #1465796 - * drm/radeon: fix doublescan modes (v2) - - LP: #1465796 - * usb: phy: Find the right match in devm_usb_phy_match - - LP: #1465796 - * tools lib traceevent kbuffer: Remove extra update to data pointer in - PADDING - - LP: #1465796 - * ring-buffer: Replace this_cpu_*() with __this_cpu_*() - - LP: #1465796 - * ASoC: wm8741: Fix rates constraints values - - LP: #1465796 - * cdc-wdm: fix endianness bug in debug statements - - LP: #1465796 - * staging: panel: fix lcd type - - LP: #1465796 - * UBI: account for bitflips in both the VID header and data - - LP: #1465796 - * UBI: fix out of bounds write - - LP: #1465796 - * UBI: initialize LEB number variable - - LP: #1465796 - * UBI: fix check for "too many bytes" - - LP: #1465796 - * ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore - - LP: #1465796 - * ASoC: davinci-evm: drop un-necessary remove function - - LP: #1465796 - * iscsi-target: Convert iscsi_thread_set usage to kthread.h - - LP: #1465796 - * Drivers: hv: vmbus: Don't wait after requesting offers - - LP: #1465796 - * Btrfs: fix log tree corruption when fs mounted with -o discard - - LP: #1465796 - * btrfs: don't accept bare namespace as a valid xattr - - LP: #1465796 - * ARM: 8320/1: fix integer overflow in ELF_ET_DYN_BASE - - LP: #1465796 - * rtlwifi: rtl8192cu: Add new USB ID - - LP: #1465796 - * MIPS: Hibernate: flush TLB entries earlier - - LP: #1465796 - * ASoC: cs4271: Increase delay time after reset - - LP: #1465796 - * stk1160: Make sure current buffer is released - - LP: #1465796 - * mnt: Improve the umount_tree flags - - LP: #1465796 - * ext4: make fsync to sync parent dir in no-journal for real this time - - LP: #1465796 - * Input: elantech - fix absolute mode setting on some ASUS laptops - - LP: #1465796 - * usb: define a generic USB_RESUME_TIMEOUT macro - - LP: #1465796 - * usb: host: xhci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: ehci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: uhci: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: musb: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: isp116x: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: fotg210: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: fusbh200: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: oxu210hp: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: r8a66597: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: host: sl811: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: dwc2: hcd: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: isp1760: hcd: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * usb: core: hub: use new USB_RESUME_TIMEOUT - - LP: #1465796 - * iser-target: Fix possible deadlock in RDMA_CM connection error - - LP: #1465796 - * gpio: mvebu: Fix mask/unmask managment per irq chip type - - LP: #1465796 - * scsi: storvsc: Fix a bug in copy_from_bounce_buffer() - - LP: #1465796 - * ALSA: emu10k1: don't deadlock in proc-functions - - LP: #1465796 - * xtensa: ISS: fix locking in TAP network adapter - - LP: #1465796 - * s390/hibernate: fix save and restore of kernel text section - - LP: #1465796 - * Btrfs: fix inode eviction infinite loop after extent_same ioctl - - LP: #1465796 - * Btrfs: fix inode eviction infinite loop after cloning into it - - LP: #1465796 - * ACPICA: Utilities: split IO address types from data type models. - - LP: #1465796 - * drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - - LP: #1465796 - * target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling - - LP: #1465796 - * mm/hugetlb: use pmd_page() in follow_huge_pmd() - - LP: #1465796 - * fs/binfmt_elf.c: fix bug in loading of PIE binaries - - LP: #1465796 - * IB/core: disallow registering 0-sized memory region - - LP: #1465796 - * IB/core: don't disallow registering region starting at 0x0 - - LP: #1465796 - * ptrace: fix race between ptrace_resume() and wait_task_stopped() - - LP: #1465796 - * mvsas: fix panic on expander attached SATA devices - - LP: #1465796 - * drm/i915: cope with large i2c transfers - - LP: #1465796 - * RCU pathwalk breakage when running into a symlink overmounting - something - - LP: #1465796 - * compal-laptop: Check return value of power_supply_register - - LP: #1465796 - * sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve - power savings and to improve performance - - LP: #1465796 - * nfs: don't call blocking operations while !TASK_RUNNING - - LP: #1465796 - * nfs: fix high load average due to callback thread sleeping - - LP: #1465796 - * e1000: add dummy allocator to fix race condition between mtu change and - netpoll - - LP: #1465796 - * wl18xx: show rx_frames_per_rates as an array as it really is - - LP: #1465796 - * lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR - - LP: #1465796 - * driver core: bus: Goto appropriate labels on failure in bus_add_device - - LP: #1465796 - * C6x: time: Ensure consistency in __init - - LP: #1465796 - * crypto: omap-aes - Fix support for unequal lengths - - LP: #1465796 - * jhash: Update jhash_[321]words functions to use correct initval - - LP: #1465796 - * KVM: use slowpath for cross page cached accesses - - LP: #1465796 - * powerpc: Fix missing L2 cache size in /sys/devices/system/cpu - - LP: #1465796 - * NFS: fix BUG() crash in notify_change() with patch to chown_common() - - LP: #1465796 - * i2c: core: Export bus recovery functions - - LP: #1465796 - * IB/mlx4: Fix WQE LSO segment calculation - - LP: #1465796 - * mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit - architectures - - LP: #1465796 - * skbuff: Do not scrub skb mark within the same name space - - LP: #1465796 - * firmware/ihex2fw.c: restore missing default in switch statement - - LP: #1465796 - * memstick: mspro_block: add missing curly braces - - LP: #1465796 - * tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support - for O= option in Makefile - - LP: #1465796 - * ext4: fix data corruption caused by unwritten and delayed extents - - LP: #1465796 - * powerpc: Add vr save/restore functions - - LP: #1465796 - * Linux 3.13.11-ckt21 - - LP: #1465796 + * SAUCE: ensure that upper/lower layers are valid before checking + permissions + - LP: #1465998 - -- Brad Figg Tue, 16 Jun 2015 10:52:43 -0700 + -- Brad Figg Wed, 17 Jun 2015 14:58:16 -0700 linux (3.13.0-55.92) trusty; urgency=low diff -u linux-3.13.0/debian/control linux-3.13.0/debian/control --- linux-3.13.0/debian/control +++ linux-3.13.0/debian/control @@ -46,7 +46,7 @@ /usr/share/doc/linux-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-3.13.0-56 +Package: linux-headers-3.13.0-55 Architecture: all Multi-Arch: foreign Section: devel @@ -55,7 +55,7 @@ Description: Header files related to Linux kernel version 3.13.0 This package provides kernel header files for version 3.13.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details Package: linux-libc-dev Architecture: i386 amd64 armhf arm64 x32 powerpc ppc64el @@ -83,17 +83,17 @@ version locked tools (such as perf and x86_energy_perf_policy) for version PGKVER. -Package: linux-tools-3.13.0-56 +Package: linux-tools-3.13.0-55 Architecture: i386 amd64 armhf arm64 powerpc ppc64el Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 3.13.0-56 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-tools-3.13.0-56-. + You probabally want to install linux-tools-3.13.0-55-. Package: linux-cloud-tools-common Architecture: all @@ -108,19 +108,19 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version PGKVER. -Package: linux-cloud-tools-3.13.0-56 +Package: linux-cloud-tools-3.13.0-55 Architecture: i386 amd64 armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 3.13.0-56 on + version locked tools for cloud tools for version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-cloud-tools-3.13.0-56-. + You probabally want to install linux-cloud-tools-3.13.0-55-. -Package: linux-image-3.13.0-56-generic +Package: linux-image-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional @@ -129,7 +129,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -146,11 +146,11 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic +Package: linux-image-extra-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -167,20 +167,20 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic +Package: linux-headers-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-dbgsym +Package: linux-image-3.13.0-55-generic-dbgsym Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional @@ -196,25 +196,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic +Package: linux-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic +Package: linux-cloud-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic @@ -227,7 +227,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-generic-lpae +Package: linux-image-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional @@ -236,7 +236,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: flash-kernel [armhf] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic-lpae +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic-lpae Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -253,11 +253,11 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic-lpae +Package: linux-image-extra-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -274,20 +274,20 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic-lpae +Package: linux-headers-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-lpae-dbgsym +Package: linux-image-3.13.0-55-generic-lpae-dbgsym Architecture: armhf Section: devel Priority: optional @@ -303,25 +303,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic-lpae +Package: linux-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic-lpae +Package: linux-cloud-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic-lpae @@ -334,7 +334,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-lowlatency +Package: linux-image-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional @@ -343,7 +343,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-lowlatency +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-lowlatency Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -360,11 +360,11 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-lowlatency +Package: linux-image-extra-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -381,20 +381,20 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-lowlatency +Package: linux-headers-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-lowlatency-dbgsym +Package: linux-image-3.13.0-55-lowlatency-dbgsym Architecture: i386 amd64 Section: devel Priority: optional @@ -410,25 +410,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-lowlatency +Package: linux-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-lowlatency +Package: linux-cloud-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-lowlatency @@ -441,7 +441,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-emb +Package: linux-image-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional @@ -450,7 +450,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-emb +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-emb Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -467,11 +467,11 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-emb +Package: linux-image-extra-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -488,20 +488,20 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-emb +Package: linux-headers-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP Book3E This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP Book3E. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-emb-dbgsym +Package: linux-image-3.13.0-55-powerpc64-emb-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -517,25 +517,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-emb +Package: linux-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-emb +Package: linux-cloud-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-emb @@ -548,7 +548,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-smp +Package: linux-image-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional @@ -557,7 +557,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-smp Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP. @@ -574,11 +574,11 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-smp +Package: linux-image-extra-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP. @@ -595,20 +595,20 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-smp +Package: linux-headers-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc64-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -624,25 +624,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-smp +Package: linux-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-smp +Package: linux-cloud-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-smp @@ -655,7 +655,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500 +Package: linux-image-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional @@ -664,7 +664,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500 +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500 Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -681,11 +681,11 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500 +Package: linux-image-extra-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -702,20 +702,20 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500 +Package: linux-headers-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -731,25 +731,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500 +Package: linux-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500 +Package: linux-cloud-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500 @@ -762,7 +762,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500mc +Package: linux-image-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional @@ -771,7 +771,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500mc +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500mc Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -788,11 +788,11 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500mc +Package: linux-image-extra-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -809,20 +809,20 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500mc +Package: linux-headers-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500mc This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500mc. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500mc-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500mc-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -838,25 +838,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500mc +Package: linux-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500mc +Package: linux-cloud-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500mc @@ -869,7 +869,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-smp +Package: linux-image-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional @@ -878,7 +878,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-smp Description: Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP. @@ -895,11 +895,11 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-smp +Package: linux-image-extra-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP. @@ -916,20 +916,20 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-smp +Package: linux-headers-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 32-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -945,25 +945,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-smp +Package: linux-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-smp +Package: linux-cloud-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-smp @@ -976,11 +976,11 @@ for easier version and migration tracking. -Package: kernel-image-3.13.0-56-generic-di +Package: kernel-image-3.13.0-55-generic-di Package-Type: udeb Provides: kernel-image, efi-modules, ext3-modules, ext4-modules Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: Linux kernel binary image for the Debian installer @@ -988,369 +988,369 @@ boot images. It does _not_ provide a usable kernel for your full Debian system. -Package: nic-modules-3.13.0-56-generic-di +Package: nic-modules-3.13.0-55-generic-di Package-Type: udeb Provides: nic-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di, virtio-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di, virtio-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Network interface support -Package: nic-shared-modules-3.13.0-56-generic-di +Package: nic-shared-modules-3.13.0-55-generic-di Package-Type: udeb Provides: nic-shared-modules -Depends: kernel-image-3.13.0-56-generic-di, crypto-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, crypto-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: nic shared modules This package contains modules which support nic modules -Package: serial-modules-3.13.0-56-generic-di +Package: serial-modules-3.13.0-55-generic-di Package-Type: udeb Provides: serial-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Serial port support -Package: ppp-modules-3.13.0-56-generic-di +Package: ppp-modules-3.13.0-55-generic-di Package-Type: udeb Provides: ppp-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di, serial-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di, serial-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PPP (serial port) networking support -Package: pata-modules-3.13.0-56-generic-di +Package: pata-modules-3.13.0-55-generic-di Package-Type: udeb Provides: pata-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PATA support modules -Package: firewire-core-modules-3.13.0-56-generic-di +Package: firewire-core-modules-3.13.0-55-generic-di Package-Type: udeb Provides: firewire-core-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Firewire (IEEE-1394) Support -Package: scsi-modules-3.13.0-56-generic-di +Package: scsi-modules-3.13.0-55-generic-di Package-Type: udeb Provides: scsi-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: SCSI storage support -Package: plip-modules-3.13.0-56-generic-di +Package: plip-modules-3.13.0-55-generic-di Package-Type: udeb Provides: plip-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di, parport-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di, parport-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PLIP (parallel port) networking support -Package: floppy-modules-3.13.0-56-generic-di +Package: floppy-modules-3.13.0-55-generic-di Package-Type: udeb Provides: floppy-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Floppy driver support -Package: fat-modules-3.13.0-56-generic-di +Package: fat-modules-3.13.0-55-generic-di Package-Type: udeb Provides: fat-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: FAT filesystem support This includes Windows FAT and VFAT support. -Package: nfs-modules-3.13.0-56-generic-di +Package: nfs-modules-3.13.0-55-generic-di Package-Type: udeb Provides: nfs-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: NFS filesystem drivers Includes the NFS client driver, and supporting modules. -Package: md-modules-3.13.0-56-generic-di +Package: md-modules-3.13.0-55-generic-di Package-Type: udeb Provides: md-modules, crypto-dm-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Multi-device support (raid, device-mapper, lvm) -Package: multipath-modules-3.13.0-56-generic-di +Package: multipath-modules-3.13.0-55-generic-di Package-Type: udeb Provides: multipath-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: DM-Multipath support This package contains modules for device-mapper multipath support. -Package: usb-modules-3.13.0-56-generic-di +Package: usb-modules-3.13.0-55-generic-di Package-Type: udeb Provides: usb-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Core USB support -Package: pcmcia-storage-modules-3.13.0-56-generic-di +Package: pcmcia-storage-modules-3.13.0-55-generic-di Package-Type: udeb Provides: pcmcia-storage-modules -Depends: kernel-image-3.13.0-56-generic-di, scsi-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, scsi-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PCMCIA storage support -Package: fb-modules-3.13.0-56-generic-di +Package: fb-modules-3.13.0-55-generic-di Package-Type: udeb Provides: fb-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Framebuffer modules -Package: input-modules-3.13.0-56-generic-di +Package: input-modules-3.13.0-55-generic-di Package-Type: udeb Provides: input-modules -Depends: kernel-image-3.13.0-56-generic-di, usb-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, usb-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Support for various input methods -Package: mouse-modules-3.13.0-56-generic-di +Package: mouse-modules-3.13.0-55-generic-di Package-Type: udeb Provides: mouse-modules -Depends: kernel-image-3.13.0-56-generic-di, input-modules-3.13.0-56-generic-di, usb-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, input-modules-3.13.0-55-generic-di, usb-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: Mouse support This package contains mouse drivers for the Linux kernel. -Package: irda-modules-3.13.0-56-generic-di +Package: irda-modules-3.13.0-55-generic-di Package-Type: udeb Provides: irda-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Support for Infrared protocols -Package: parport-modules-3.13.0-56-generic-di +Package: parport-modules-3.13.0-55-generic-di Package-Type: udeb Provides: parport-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Parallel port support -Package: nic-pcmcia-modules-3.13.0-56-generic-di +Package: nic-pcmcia-modules-3.13.0-55-generic-di Package-Type: udeb Provides: nic-pcmcia-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di, nic-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di, nic-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PCMCIA network interface support -Package: pcmcia-modules-3.13.0-56-generic-di +Package: pcmcia-modules-3.13.0-55-generic-di Package-Type: udeb Provides: pcmcia-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: PCMCIA Modules -Package: nic-usb-modules-3.13.0-56-generic-di +Package: nic-usb-modules-3.13.0-55-generic-di Package-Type: udeb Provides: nic-usb-modules -Depends: kernel-image-3.13.0-56-generic-di, nic-shared-modules-3.13.0-56-generic-di, usb-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, nic-shared-modules-3.13.0-55-generic-di, usb-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: USB network interface support -Package: sata-modules-3.13.0-56-generic-di +Package: sata-modules-3.13.0-55-generic-di Package-Type: udeb Provides: sata-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: SATA storage support -Package: crypto-modules-3.13.0-56-generic-di +Package: crypto-modules-3.13.0-55-generic-di Package-Type: udeb Provides: crypto-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: crypto modules This package contains crypto modules. -Package: squashfs-modules-3.13.0-56-generic-di +Package: squashfs-modules-3.13.0-55-generic-di Package-Type: udeb Provides: squashfs-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: squashfs modules This package contains squashfs modules. -Package: speakup-modules-3.13.0-56-generic-di +Package: speakup-modules-3.13.0-55-generic-di Package-Type: udeb Provides: speakup-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: speakup modules This package contains speakup modules. -Package: virtio-modules-3.13.0-56-generic-di +Package: virtio-modules-3.13.0-55-generic-di Package-Type: udeb Provides: virtio-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: VirtIO Modules Includes modules for VirtIO (virtual machine, generally kvm guests) -Package: fs-core-modules-3.13.0-56-generic-di +Package: fs-core-modules-3.13.0-55-generic-di Package-Type: udeb Provides: fs-core-modules, ext2-modules, jfs-modules, reiserfs-modules, xfs-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Base filesystem modules This includes jfs, reiserfs and xfs. -Package: fs-secondary-modules-3.13.0-56-generic-di +Package: fs-secondary-modules-3.13.0-55-generic-di Package-Type: udeb Provides: fs-secondary-modules, btrfs-modules, ntfs-modules, hfs-modules -Depends: kernel-image-3.13.0-56-generic-di, fat-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, fat-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Extra filesystem modules This includes support for Windows NTFS and MacOS HFS/HFSPlus -Package: storage-core-modules-3.13.0-56-generic-di +Package: storage-core-modules-3.13.0-55-generic-di Package-Type: udeb Provides: storage-core-modules, loop-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Core storage support Includes core SCSI, LibATA, USB-Storage. Also includes related block devices for CD, Disk and Tape medium (and IDE Floppy). -Package: block-modules-3.13.0-56-generic-di +Package: block-modules-3.13.0-55-generic-di Package-Type: udeb Provides: block-modules, nbd-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di, parport-modules-3.13.0-56-generic-di, virtio-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di, parport-modules-3.13.0-55-generic-di, virtio-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Block storage devices This package contains the block storage devices, including DAC960 and paraide. -Package: message-modules-3.13.0-56-generic-di +Package: message-modules-3.13.0-55-generic-di Package-Type: udeb Provides: message-modules -Depends: kernel-image-3.13.0-56-generic-di, storage-core-modules-3.13.0-56-generic-di, scsi-modules-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di, storage-core-modules-3.13.0-55-generic-di, scsi-modules-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: Fusion and i2o storage modules This package containes the fusion and i2o storage modules. -Package: vlan-modules-3.13.0-56-generic-di +Package: vlan-modules-3.13.0-55-generic-di Package-Type: udeb Provides: vlan-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: extra Description: vlan modules This package contains vlan (8021.Q) modules. -Package: ipmi-modules-3.13.0-56-generic-di +Package: ipmi-modules-3.13.0-55-generic-di Package-Type: udeb Provides: ipmi-modules -Depends: kernel-image-3.13.0-56-generic-di +Depends: kernel-image-3.13.0-55-generic-di Architecture: amd64 -Kernel-Version: 3.13.0-56-generic +Kernel-Version: 3.13.0-55-generic Section: debian-installer Priority: standard Description: ipmi modules diff -u linux-3.13.0/debian/control.stub linux-3.13.0/debian/control.stub --- linux-3.13.0/debian/control.stub +++ linux-3.13.0/debian/control.stub @@ -46,7 +46,7 @@ /usr/share/doc/linux-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-3.13.0-56 +Package: linux-headers-3.13.0-55 Architecture: all Multi-Arch: foreign Section: devel @@ -55,7 +55,7 @@ Description: Header files related to Linux kernel version 3.13.0 This package provides kernel header files for version 3.13.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details Package: linux-libc-dev Architecture: i386 amd64 armhf arm64 x32 powerpc ppc64el @@ -83,17 +83,17 @@ version locked tools (such as perf and x86_energy_perf_policy) for version PGKVER. -Package: linux-tools-3.13.0-56 +Package: linux-tools-3.13.0-55 Architecture: i386 amd64 armhf arm64 powerpc ppc64el Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 3.13.0-56 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-tools-3.13.0-56-. + You probabally want to install linux-tools-3.13.0-55-. Package: linux-cloud-tools-common Architecture: all @@ -108,19 +108,19 @@ This package provides the architecture independent parts for kernel version locked tools for cloud tools for version PGKVER. -Package: linux-cloud-tools-3.13.0-56 +Package: linux-cloud-tools-3.13.0-55 Architecture: i386 amd64 armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 3.13.0-56 on + version locked tools for cloud tools for version 3.13.0-55 on 64 bit x86. - You probabally want to install linux-cloud-tools-3.13.0-56-. + You probabally want to install linux-cloud-tools-3.13.0-55-. -Package: linux-image-3.13.0-56-generic +Package: linux-image-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional @@ -129,7 +129,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -146,11 +146,11 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic +Package: linux-image-extra-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -167,20 +167,20 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic +Package: linux-headers-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-dbgsym +Package: linux-image-3.13.0-55-generic-dbgsym Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional @@ -196,25 +196,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic +Package: linux-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic +Package: linux-cloud-tools-3.13.0-55-generic Architecture: i386 amd64 armhf arm64 ppc64el Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic @@ -227,7 +227,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-generic-lpae +Package: linux-image-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional @@ -236,7 +236,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: flash-kernel [armhf] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-generic-lpae +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-generic-lpae Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -253,11 +253,11 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-generic-lpae +Package: linux-image-extra-3.13.0-55-generic-lpae Architecture: armhf Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-generic-lpae, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -274,20 +274,20 @@ the linux-generic-lpae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-generic-lpae +Package: linux-headers-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-generic-lpae-dbgsym +Package: linux-image-3.13.0-55-generic-lpae-dbgsym Architecture: armhf Section: devel Priority: optional @@ -303,25 +303,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-generic-lpae +Package: linux-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-generic-lpae +Package: linux-cloud-tools-3.13.0-55-generic-lpae Architecture: armhf Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-generic-lpae @@ -334,7 +334,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-lowlatency +Package: linux-image-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional @@ -343,7 +343,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-lowlatency +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-lowlatency Description: Linux kernel image for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel image for version 3.13.0 on 64 bit x86 SMP. @@ -360,11 +360,11 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-lowlatency +Package: linux-image-extra-3.13.0-55-lowlatency Architecture: i386 amd64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-lowlatency, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64 bit x86 SMP. @@ -381,20 +381,20 @@ the linux-lowlatency meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-lowlatency +Package: linux-headers-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64 bit x86 SMP This package provides kernel header files for version 3.13.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-lowlatency-dbgsym +Package: linux-image-3.13.0-55-lowlatency-dbgsym Architecture: i386 amd64 Section: devel Priority: optional @@ -410,25 +410,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-lowlatency +Package: linux-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-lowlatency +Package: linux-cloud-tools-3.13.0-55-lowlatency Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-lowlatency @@ -441,7 +441,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-emb +Package: linux-image-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional @@ -450,7 +450,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-emb +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-emb Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -467,11 +467,11 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-emb +Package: linux-image-extra-3.13.0-55-powerpc64-emb Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-emb, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP Book3E. @@ -488,20 +488,20 @@ the linux-powerpc64-emb meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-emb +Package: linux-headers-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP Book3E This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP Book3E. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-emb-dbgsym +Package: linux-image-3.13.0-55-powerpc64-emb-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -517,25 +517,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-emb +Package: linux-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-emb +Package: linux-cloud-tools-3.13.0-55-powerpc64-emb Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-emb @@ -548,7 +548,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc64-smp +Package: linux-image-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional @@ -557,7 +557,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc64-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc64-smp Description: Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 64-bit PowerPC SMP. @@ -574,11 +574,11 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc64-smp +Package: linux-image-extra-3.13.0-55-powerpc64-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc64-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 64-bit PowerPC SMP. @@ -595,20 +595,20 @@ the linux-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc64-smp +Package: linux-headers-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 64-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 64-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc64-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc64-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -624,25 +624,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc64-smp +Package: linux-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc64-smp +Package: linux-cloud-tools-3.13.0-55-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc64-smp @@ -655,7 +655,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500 +Package: linux-image-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional @@ -664,7 +664,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500 +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500 Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -681,11 +681,11 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500 +Package: linux-image-extra-3.13.0-55-powerpc-e500 Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. @@ -702,20 +702,20 @@ the linux-powerpc-e500 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500 +Package: linux-headers-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2 This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500v1 and e500v2. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -731,25 +731,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500 +Package: linux-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500 +Package: linux-cloud-tools-3.13.0-55-powerpc-e500 Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500 @@ -762,7 +762,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-e500mc +Package: linux-image-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional @@ -771,7 +771,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-ieee1275 -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-e500mc +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-e500mc Description: Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel image for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -788,11 +788,11 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-e500mc +Package: linux-image-extra-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-e500mc, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit Freescale Power e500mc. @@ -809,20 +809,20 @@ the linux-powerpc-e500mc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-e500mc +Package: linux-headers-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit Freescale Power e500mc This package provides kernel header files for version 3.13.0 on 32-bit Freescale Power e500mc. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-e500mc-dbgsym +Package: linux-image-3.13.0-55-powerpc-e500mc-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -838,25 +838,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-e500mc +Package: linux-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-e500mc +Package: linux-cloud-tools-3.13.0-55-powerpc-e500mc Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-e500mc @@ -869,7 +869,7 @@ for easier version and migration tracking. -Package: linux-image-3.13.0-56-powerpc-smp +Package: linux-image-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional @@ -878,7 +878,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-56-powerpc-smp +Suggests: fdutils, linux-doc-3.13.0 | linux-source-3.13.0, linux-tools, linux-headers-3.13.0-55-powerpc-smp Description: Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel image for version 3.13.0 on 32-bit PowerPC SMP. @@ -895,11 +895,11 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-3.13.0-56-powerpc-smp +Package: linux-image-extra-3.13.0-55-powerpc-smp Architecture: powerpc Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-56-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-3.13.0-55-powerpc-smp, crda (>=1.1.1-1ubuntu2) | wireless-crda Description: Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP This package contains the Linux kernel extra modules for version 3.13.0 on 32-bit PowerPC SMP. @@ -916,20 +916,20 @@ the linux-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.13.0-56-powerpc-smp +Package: linux-headers-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-3.13.0-56, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-headers-3.13.0-55, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 3.13.0 on 32-bit PowerPC SMP This package provides kernel header files for version 3.13.0 on 32-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.13.0-56/debian.README.gz for details. + /usr/share/doc/linux-headers-3.13.0-55/debian.README.gz for details. -Package: linux-image-3.13.0-56-powerpc-smp-dbgsym +Package: linux-image-3.13.0-55-powerpc-smp-dbgsym Architecture: powerpc Section: devel Priority: optional @@ -945,25 +945,25 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-3.13.0-56-powerpc-smp +Package: linux-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-tools-3.13.0-56 -Description: Linux kernel version specific tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-tools-3.13.0-55 +Description: Linux kernel version specific tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 3.13.0-56 on + version 3.13.0-55 on 64 bit x86. -Package: linux-cloud-tools-3.13.0-56-powerpc-smp +Package: linux-cloud-tools-3.13.0-55-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-56 -Description: Linux kernel version specific cloud tools for version 3.13.0-56 +Depends: ${misc:Depends}, linux-cloud-tools-3.13.0-55 +Description: Linux kernel version specific cloud tools for version 3.13.0-55 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 3.13.0-56 on + version locked tools for cloud for version 3.13.0-55 on 64 bit x86. Package: linux-udebs-powerpc-smp diff -u linux-3.13.0/drivers/ata/ahci.c linux-3.13.0/drivers/ata/ahci.c --- linux-3.13.0/drivers/ata/ahci.c +++ linux-3.13.0/drivers/ata/ahci.c @@ -67,7 +67,6 @@ board_ahci_yes_fbs, /* board IDs for specific chipsets in alphabetical order */ - board_ahci_avn, board_ahci_mcp65, board_ahci_mcp77, board_ahci_mcp89, @@ -86,8 +85,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); -static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, - unsigned long deadline); static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); #ifdef CONFIG_PM @@ -109,11 +106,6 @@ .hardreset = ahci_p5wdh_hardreset, }; -static struct ata_port_operations ahci_avn_ops = { - .inherits = &ahci_ops, - .hardreset = ahci_avn_hardreset, -}; - static const struct ata_port_info ahci_port_info[] = { /* by features */ [board_ahci] = { @@ -158,12 +150,6 @@ .port_ops = &ahci_ops, }, /* by chipsets */ - [board_ahci_avn] = { - .flags = AHCI_FLAG_COMMON, - .pio_mask = ATA_PIO4, - .udma_mask = ATA_UDMA6, - .port_ops = &ahci_avn_ops, - }, [board_ahci_mcp65] = { AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ), @@ -303,14 +289,14 @@ { PCI_VDEVICE(INTEL, 0x1f27), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x1f2e), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x1f2f), board_ahci }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f32), board_ahci_avn }, /* Avoton AHCI */ - { PCI_VDEVICE(INTEL, 0x1f33), board_ahci_avn }, /* Avoton AHCI */ - { PCI_VDEVICE(INTEL, 0x1f34), board_ahci_avn }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f35), board_ahci_avn }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f36), board_ahci_avn }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f37), board_ahci_avn }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci_avn }, /* Avoton RAID */ - { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f32), board_ahci }, /* Avoton AHCI */ + { PCI_VDEVICE(INTEL, 0x1f33), board_ahci }, /* Avoton AHCI */ + { PCI_VDEVICE(INTEL, 0x1f34), board_ahci }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f35), board_ahci }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f36), board_ahci }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */ + { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */ @@ -688,79 +674,6 @@ return rc; } -/* - * ahci_avn_hardreset - attempt more aggressive recovery of Avoton ports. - * - * It has been observed with some SSDs that the timing of events in the - * link synchronization phase can leave the port in a state that can not - * be recovered by a SATA-hard-reset alone. The failing signature is - * SStatus.DET stuck at 1 ("Device presence detected but Phy - * communication not established"). It was found that unloading and - * reloading the driver when this problem occurs allows the drive - * connection to be recovered (DET advanced to 0x3). The critical - * component of reloading the driver is that the port state machines are - * reset by bouncing "port enable" in the AHCI PCS configuration - * register. So, reproduce that effect by bouncing a port whenever we - * see DET==1 after a reset. - */ -static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, - unsigned long deadline) -{ - const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context); - struct ata_port *ap = link->ap; - struct ahci_port_priv *pp = ap->private_data; - struct ahci_host_priv *hpriv = ap->host->private_data; - u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; - unsigned long tmo = deadline - jiffies; - struct ata_taskfile tf; - bool online; - int rc, i; - - DPRINTK("ENTER\n"); - - ahci_stop_engine(ap); - - for (i = 0; i < 2; i++) { - u16 val; - u32 sstatus; - int port = ap->port_no; - struct ata_host *host = ap->host; - struct pci_dev *pdev = to_pci_dev(host->dev); - - /* clear D2H reception area to properly wait for D2H FIS */ - ata_tf_init(link->device, &tf); - tf.command = ATA_BUSY; - ata_tf_to_fis(&tf, 0, 0, d2h_fis); - - rc = sata_link_hardreset(link, timing, deadline, &online, - ahci_check_ready); - - if (sata_scr_read(link, SCR_STATUS, &sstatus) != 0 || - (sstatus & 0xf) != 1) - break; - - ata_link_printk(link, KERN_INFO, "avn bounce port%d\n", - port); - - pci_read_config_word(pdev, 0x92, &val); - val &= ~(1 << port); - pci_write_config_word(pdev, 0x92, val); - ata_msleep(ap, 1000); - val |= 1 << port; - pci_write_config_word(pdev, 0x92, val); - deadline += tmo; - } - - hpriv->start_engine(ap); - - if (online) - *class = ahci_dev_classify(ap); - - DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class); - return rc; -} - - #ifdef CONFIG_PM static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) { diff -u linux-3.13.0/drivers/ata/libata-core.c linux-3.13.0/drivers/ata/libata-core.c --- linux-3.13.0/drivers/ata/libata-core.c +++ linux-3.13.0/drivers/ata/libata-core.c @@ -4228,7 +4228,6 @@ { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Crucial_CT*M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Samsung SSD 8*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, /* * Some WD SATA-I drives spin up and down erratically when the link diff -u linux-3.13.0/drivers/base/bus.c linux-3.13.0/drivers/base/bus.c --- linux-3.13.0/drivers/base/bus.c +++ linux-3.13.0/drivers/base/bus.c @@ -504,11 +504,11 @@ goto out_put; error = device_add_groups(dev, bus->dev_groups); if (error) - goto out_id; + goto out_groups; error = sysfs_create_link(&bus->p->devices_kset->kobj, &dev->kobj, dev_name(dev)); if (error) - goto out_groups; + goto out_id; error = sysfs_create_link(&dev->kobj, &dev->bus->p->subsys.kobj, "subsystem"); if (error) diff -u linux-3.13.0/drivers/bluetooth/ath3k.c linux-3.13.0/drivers/bluetooth/ath3k.c --- linux-3.13.0/drivers/bluetooth/ath3k.c +++ linux-3.13.0/drivers/bluetooth/ath3k.c @@ -64,7 +64,6 @@ /* Atheros AR3011 with sflash firmware*/ { USB_DEVICE(0x0489, 0xE027) }, { USB_DEVICE(0x0489, 0xE03D) }, - { USB_DEVICE(0x04F2, 0xAFF1) }, { USB_DEVICE(0x0930, 0x0215) }, { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x0CF3, 0xE019) }, diff -u linux-3.13.0/drivers/bluetooth/btusb.c linux-3.13.0/drivers/bluetooth/btusb.c --- linux-3.13.0/drivers/bluetooth/btusb.c +++ linux-3.13.0/drivers/bluetooth/btusb.c @@ -151,7 +151,6 @@ /* Atheros 3011 with sflash firmware */ { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE }, - { USB_DEVICE(0x04f2, 0xaff1), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE }, diff -u linux-3.13.0/drivers/crypto/omap-aes.c linux-3.13.0/drivers/crypto/omap-aes.c --- linux-3.13.0/drivers/crypto/omap-aes.c +++ linux-3.13.0/drivers/crypto/omap-aes.c @@ -554,23 +554,15 @@ return err; } -static int omap_aes_check_aligned(struct scatterlist *sg, int total) +static int omap_aes_check_aligned(struct scatterlist *sg) { - int len = 0; - while (sg) { if (!IS_ALIGNED(sg->offset, 4)) return -1; if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE)) return -1; - - len += sg->length; sg = sg_next(sg); } - - if (len != total) - return -1; - return 0; } @@ -641,8 +633,8 @@ dd->in_sg = req->src; dd->out_sg = req->dst; - if (omap_aes_check_aligned(dd->in_sg, dd->total) || - omap_aes_check_aligned(dd->out_sg, dd->total)) { + if (omap_aes_check_aligned(dd->in_sg) || + omap_aes_check_aligned(dd->out_sg)) { if (omap_aes_copy_sgs(dd)) pr_err("Failed to copy SGs for unaligned cases\n"); dd->sgs_copied = 1; reverted: --- linux-3.13.0/drivers/gpio/gpio-mvebu.c +++ linux-3.13.0.orig/drivers/gpio/gpio-mvebu.c @@ -304,13 +304,11 @@ { struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct mvebu_gpio_chip *mvchip = gc->private; - struct irq_chip_type *ct = irq_data_get_chip_type(d); u32 mask = 1 << (d->irq - gc->irq_base); irq_gc_lock(gc); + gc->mask_cache &= ~mask; + writel_relaxed(gc->mask_cache, mvebu_gpioreg_edge_mask(mvchip)); - ct->mask_cache_priv &= ~mask; - - writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_edge_mask(mvchip)); irq_gc_unlock(gc); } @@ -318,13 +316,11 @@ { struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct mvebu_gpio_chip *mvchip = gc->private; - struct irq_chip_type *ct = irq_data_get_chip_type(d); - u32 mask = 1 << (d->irq - gc->irq_base); irq_gc_lock(gc); + gc->mask_cache |= mask; + writel_relaxed(gc->mask_cache, mvebu_gpioreg_edge_mask(mvchip)); - ct->mask_cache_priv |= mask; - writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_edge_mask(mvchip)); irq_gc_unlock(gc); } @@ -332,13 +328,11 @@ { struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct mvebu_gpio_chip *mvchip = gc->private; - struct irq_chip_type *ct = irq_data_get_chip_type(d); - u32 mask = 1 << (d->irq - gc->irq_base); irq_gc_lock(gc); + gc->mask_cache &= ~mask; + writel_relaxed(gc->mask_cache, mvebu_gpioreg_level_mask(mvchip)); - ct->mask_cache_priv &= ~mask; - writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_level_mask(mvchip)); irq_gc_unlock(gc); } @@ -346,13 +340,11 @@ { struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct mvebu_gpio_chip *mvchip = gc->private; - struct irq_chip_type *ct = irq_data_get_chip_type(d); - u32 mask = 1 << (d->irq - gc->irq_base); irq_gc_lock(gc); + gc->mask_cache |= mask; + writel_relaxed(gc->mask_cache, mvebu_gpioreg_level_mask(mvchip)); - ct->mask_cache_priv |= mask; - writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_level_mask(mvchip)); irq_gc_unlock(gc); } diff -u linux-3.13.0/drivers/gpu/drm/i915/i915_irq.c linux-3.13.0/drivers/gpu/drm/i915/i915_irq.c --- linux-3.13.0/drivers/gpu/drm/i915/i915_irq.c +++ linux-3.13.0/drivers/gpu/drm/i915/i915_irq.c @@ -3132,12 +3132,14 @@ ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | - I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); + I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); I915_WRITE16(IMR, dev_priv->irq_mask); I915_WRITE16(IER, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | I915_USER_INTERRUPT); POSTING_READ16(IER); @@ -3301,12 +3303,14 @@ I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | - I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); + I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); enable_mask = I915_ASLE_INTERRUPT | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | I915_USER_INTERRUPT; if (I915_HAS_HOTPLUG(dev)) { diff -u linux-3.13.0/drivers/gpu/drm/i915/i915_reg.h linux-3.13.0/drivers/gpu/drm/i915/i915_reg.h --- linux-3.13.0/drivers/gpu/drm/i915/i915_reg.h +++ linux-3.13.0/drivers/gpu/drm/i915/i915_reg.h @@ -1181,7 +1181,6 @@ #define GMBUS_CYCLE_INDEX (2<<25) #define GMBUS_CYCLE_STOP (4<<25) #define GMBUS_BYTE_COUNT_SHIFT 16 -#define GMBUS_BYTE_COUNT_MAX 256U #define GMBUS_SLAVE_INDEX_SHIFT 8 #define GMBUS_SLAVE_ADDR_SHIFT 1 #define GMBUS_SLAVE_READ (1<<0) reverted: --- linux-3.13.0/drivers/gpu/drm/i915/intel_i2c.c +++ linux-3.13.0.orig/drivers/gpu/drm/i915/intel_i2c.c @@ -340,17 +340,18 @@ } static int +gmbus_xfer_read(struct drm_i915_private *dev_priv, struct i2c_msg *msg, + u32 gmbus1_index) -gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv, - unsigned short addr, u8 *buf, unsigned int len, - u32 gmbus1_index) { int reg_offset = dev_priv->gpio_mmio_base; + u16 len = msg->len; + u8 *buf = msg->buf; I915_WRITE(GMBUS1 + reg_offset, gmbus1_index | GMBUS_CYCLE_WAIT | (len << GMBUS_BYTE_COUNT_SHIFT) | + (msg->addr << GMBUS_SLAVE_ADDR_SHIFT) | - (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_READ | GMBUS_SW_RDY); while (len) { int ret; @@ -372,35 +373,11 @@ } static int +gmbus_xfer_write(struct drm_i915_private *dev_priv, struct i2c_msg *msg) -gmbus_xfer_read(struct drm_i915_private *dev_priv, struct i2c_msg *msg, - u32 gmbus1_index) { + int reg_offset = dev_priv->gpio_mmio_base; + u16 len = msg->len; u8 *buf = msg->buf; - unsigned int rx_size = msg->len; - unsigned int len; - int ret; - - do { - len = min(rx_size, GMBUS_BYTE_COUNT_MAX); - - ret = gmbus_xfer_read_chunk(dev_priv, msg->addr, - buf, len, gmbus1_index); - if (ret) - return ret; - - rx_size -= len; - buf += len; - } while (rx_size != 0); - - return 0; -} - -static int -gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv, - unsigned short addr, u8 *buf, unsigned int len) -{ - int reg_offset = dev_priv->gpio_mmio_base; - unsigned int chunk_size = len; u32 val, loop; val = loop = 0; @@ -412,8 +389,8 @@ I915_WRITE(GMBUS3 + reg_offset, val); I915_WRITE(GMBUS1 + reg_offset, GMBUS_CYCLE_WAIT | + (msg->len << GMBUS_BYTE_COUNT_SHIFT) | + (msg->addr << GMBUS_SLAVE_ADDR_SHIFT) | - (chunk_size << GMBUS_BYTE_COUNT_SHIFT) | - (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_WRITE | GMBUS_SW_RDY); while (len) { int ret; @@ -430,29 +407,6 @@ if (ret) return ret; } - - return 0; -} - -static int -gmbus_xfer_write(struct drm_i915_private *dev_priv, struct i2c_msg *msg) -{ - u8 *buf = msg->buf; - unsigned int tx_size = msg->len; - unsigned int len; - int ret; - - do { - len = min(tx_size, GMBUS_BYTE_COUNT_MAX); - - ret = gmbus_xfer_write_chunk(dev_priv, msg->addr, buf, len); - if (ret) - return ret; - - buf += len; - tx_size -= len; - } while (tx_size != 0); - return 0; } diff -u linux-3.13.0/drivers/gpu/drm/radeon/atombios_crtc.c linux-3.13.0/drivers/gpu/drm/radeon/atombios_crtc.c --- linux-3.13.0/drivers/gpu/drm/radeon/atombios_crtc.c +++ linux-3.13.0/drivers/gpu/drm/radeon/atombios_crtc.c @@ -330,10 +330,8 @@ misc |= ATOM_COMPOSITESYNC; if (mode->flags & DRM_MODE_FLAG_INTERLACE) misc |= ATOM_INTERLACE; - if (mode->flags & DRM_MODE_FLAG_DBLCLK) - misc |= ATOM_DOUBLE_CLOCK_MODE; if (mode->flags & DRM_MODE_FLAG_DBLSCAN) - misc |= ATOM_H_REPLICATIONBY2 | ATOM_V_REPLICATIONBY2; + misc |= ATOM_DOUBLE_CLOCK_MODE; args.susModeMiscInfo.usAccess = cpu_to_le16(misc); args.ucCRTC = radeon_crtc->crtc_id; @@ -376,10 +374,8 @@ misc |= ATOM_COMPOSITESYNC; if (mode->flags & DRM_MODE_FLAG_INTERLACE) misc |= ATOM_INTERLACE; - if (mode->flags & DRM_MODE_FLAG_DBLCLK) - misc |= ATOM_DOUBLE_CLOCK_MODE; if (mode->flags & DRM_MODE_FLAG_DBLSCAN) - misc |= ATOM_H_REPLICATIONBY2 | ATOM_V_REPLICATIONBY2; + misc |= ATOM_DOUBLE_CLOCK_MODE; args.susModeMiscInfo.usAccess = cpu_to_le16(misc); args.ucCRTC = radeon_crtc->crtc_id; diff -u linux-3.13.0/drivers/hv/channel.c linux-3.13.0/drivers/hv/channel.c --- linux-3.13.0/drivers/hv/channel.c +++ linux-3.13.0/drivers/hv/channel.c @@ -134,7 +134,7 @@ GFP_KERNEL); if (!open_info) { err = -ENOMEM; - goto error_gpadl; + goto error0; } init_completion(&open_info->waitevent); @@ -150,7 +150,7 @@ if (userdatalen > MAX_USER_DEFINED_BYTES) { err = -EINVAL; - goto error_gpadl; + goto error0; } if (userdatalen) @@ -194,9 +194,6 @@ list_del(&open_info->msglistentry); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); -error_gpadl: - vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle); - error0: free_pages((unsigned long)out, get_order(send_ringbuffer_size + recv_ringbuffer_size)); diff -u linux-3.13.0/drivers/hv/channel_mgmt.c linux-3.13.0/drivers/hv/channel_mgmt.c --- linux-3.13.0/drivers/hv/channel_mgmt.c +++ linux-3.13.0/drivers/hv/channel_mgmt.c @@ -716,7 +716,7 @@ { struct vmbus_channel_message_header *msg; struct vmbus_channel_msginfo *msginfo; - int ret; + int ret, t; msginfo = kmalloc(sizeof(*msginfo) + sizeof(struct vmbus_channel_message_header), @@ -724,6 +724,8 @@ if (!msginfo) return -ENOMEM; + init_completion(&msginfo->waitevent); + msg = (struct vmbus_channel_message_header *)msginfo->msg; msg->msgtype = CHANNELMSG_REQUESTOFFERS; @@ -737,6 +739,14 @@ goto cleanup; } + t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ); + if (t == 0) { + ret = -ETIMEDOUT; + goto cleanup; + } + + + cleanup: kfree(msginfo); reverted: --- linux-3.13.0/drivers/i2c/i2c-core.c +++ linux-3.13.0.orig/drivers/i2c/i2c-core.c @@ -212,7 +212,6 @@ adap->bus_recovery_info->set_scl(adap, 1); return i2c_generic_recovery(adap); } -EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery); int i2c_generic_gpio_recovery(struct i2c_adapter *adap) { @@ -227,7 +226,6 @@ return ret; } -EXPORT_SYMBOL_GPL(i2c_generic_gpio_recovery); int i2c_recover_bus(struct i2c_adapter *adap) { @@ -237,7 +235,6 @@ dev_dbg(&adap->dev, "Trying i2c bus recovery\n"); return adap->bus_recovery_info->recover_bus(adap); } -EXPORT_SYMBOL_GPL(i2c_recover_bus); static int i2c_device_probe(struct device *dev) { diff -u linux-3.13.0/drivers/infiniband/core/umem.c linux-3.13.0/drivers/infiniband/core/umem.c --- linux-3.13.0/drivers/infiniband/core/umem.c +++ linux-3.13.0/drivers/infiniband/core/umem.c @@ -94,15 +94,12 @@ if (dmasync) dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs); - if (!size) - return ERR_PTR(-EINVAL); - /* * If the combination of the addr and size requested for this memory * region causes an integer overflow, return error. */ - if (((addr + size) < addr) || - PAGE_ALIGN(addr + size) < (addr + size)) + if ((PAGE_ALIGN(addr + size) <= size) || + (PAGE_ALIGN(addr + size) <= addr)) return ERR_PTR(-EINVAL); if (!can_do_mlock()) diff -u linux-3.13.0/drivers/infiniband/hw/mlx4/qp.c linux-3.13.0/drivers/infiniband/hw/mlx4/qp.c --- linux-3.13.0/drivers/infiniband/hw/mlx4/qp.c +++ linux-3.13.0/drivers/infiniband/hw/mlx4/qp.c @@ -2487,7 +2487,8 @@ memcpy(wqe->header, wr->wr.ud.header, wr->wr.ud.hlen); - *lso_hdr_sz = cpu_to_be32(wr->wr.ud.mss << 16 | wr->wr.ud.hlen); + *lso_hdr_sz = cpu_to_be32((wr->wr.ud.mss - wr->wr.ud.hlen) << 16 | + wr->wr.ud.hlen); *lso_seg_len = halign; return 0; } diff -u linux-3.13.0/drivers/infiniband/ulp/isert/ib_isert.c linux-3.13.0/drivers/infiniband/ulp/isert/ib_isert.c --- linux-3.13.0/drivers/infiniband/ulp/isert/ib_isert.c +++ linux-3.13.0/drivers/infiniband/ulp/isert/ib_isert.c @@ -206,7 +206,7 @@ static void isert_free_rx_descriptors(struct isert_conn *isert_conn) { - struct ib_device *ib_dev = isert_conn->conn_device->ib_device; + struct ib_device *ib_dev = isert_conn->conn_cm_id->device; struct iser_rx_desc *rx_desc; int i; @@ -643,8 +643,8 @@ static void isert_connect_release(struct isert_conn *isert_conn) { + struct ib_device *ib_dev = isert_conn->conn_cm_id->device; struct isert_device *device = isert_conn->conn_device; - struct ib_device *ib_dev = device->ib_device; int cq_index; pr_debug("Entering isert_connect_release(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"); @@ -653,8 +653,7 @@ isert_conn_free_fastreg_pool(isert_conn); isert_free_rx_descriptors(isert_conn); - if (isert_conn->conn_cm_id) - rdma_destroy_id(isert_conn->conn_cm_id); + rdma_destroy_id(isert_conn->conn_cm_id); if (isert_conn->conn_qp) { cq_index = ((struct isert_cq_desc *) @@ -812,15 +811,12 @@ return 0; } -static int +static void isert_connect_error(struct rdma_cm_id *cma_id) { struct isert_conn *isert_conn = cma_id->qp->qp_context; - isert_conn->conn_cm_id = NULL; isert_put_conn(isert_conn); - - return -1; } static int @@ -850,7 +846,7 @@ case RDMA_CM_EVENT_REJECTED: /* FALLTHRU */ case RDMA_CM_EVENT_UNREACHABLE: /* FALLTHRU */ case RDMA_CM_EVENT_CONNECT_ERROR: - ret = isert_connect_error(cma_id); + isert_connect_error(cma_id); break; default: pr_err("Unhandled RDMA CMA event: %d\n", event->event); diff -u linux-3.13.0/drivers/input/mouse/elantech.c linux-3.13.0/drivers/input/mouse/elantech.c --- linux-3.13.0/drivers/input/mouse/elantech.c +++ linux-3.13.0/drivers/input/mouse/elantech.c @@ -814,21 +814,6 @@ } /* - * This writes the reg_07 value again to the hardware at the end of every - * set_rate call because the register loses its value. reg_07 allows setting - * absolute mode on v4 hardware - */ -static void elantech_set_rate_restore_reg_07(struct psmouse *psmouse, - unsigned int rate) -{ - struct elantech_data *etd = psmouse->private; - - etd->original_set_rate(psmouse, rate); - if (elantech_write_reg(psmouse, 0x07, etd->reg_07)) - psmouse_err(psmouse, "restoring reg_07 failed\n"); -} - -/* * Put the touchpad into absolute mode */ static int elantech_set_absolute_mode(struct psmouse *psmouse) @@ -1030,8 +1015,6 @@ * Asus K53SV 0x450f01 78, 15, 0c 2 hw buttons * Asus G46VW 0x460f02 00, 18, 0c 2 hw buttons * Asus G750JX 0x360f00 00, 16, 0c 2 hw buttons - * Asus TP500LN 0x381f17 10, 14, 0e clickpad - * Asus X750JN 0x381f17 10, 14, 0e clickpad * Asus UX31 0x361f00 20, 15, 0e clickpad * Asus UX32VD 0x361f02 00, 15, 0e clickpad * Avatar AVIU-145A2 0x361f00 ? clickpad @@ -1416,7 +1399,6 @@ case 9: case 10: case 13: - case 14: etd->hw_version = 4; break; default: @@ -1511,11 +1493,6 @@ goto init_fail; } - if (etd->fw_version == 0x381f17) { - etd->original_set_rate = psmouse->set_rate; - psmouse->set_rate = elantech_set_rate_restore_reg_07; - } - if (elantech_set_input_params(psmouse)) { psmouse_err(psmouse, "failed to query touchpad range.\n"); goto init_fail; diff -u linux-3.13.0/drivers/input/mouse/elantech.h linux-3.13.0/drivers/input/mouse/elantech.h --- linux-3.13.0/drivers/input/mouse/elantech.h +++ linux-3.13.0/drivers/input/mouse/elantech.h @@ -139,7 +139,6 @@ struct finger_pos mt[ETP_MAX_FINGERS]; unsigned char parity[256]; int (*send_cmd)(struct psmouse *psmouse, unsigned char c, unsigned char *param); - void (*original_set_rate)(struct psmouse *psmouse, unsigned int rate); }; #ifdef CONFIG_MOUSE_PS2_ELANTECH reverted: --- linux-3.13.0/drivers/media/usb/stk1160/stk1160-v4l.c +++ linux-3.13.0.orig/drivers/media/usb/stk1160/stk1160-v4l.c @@ -244,11 +244,6 @@ if (mutex_lock_interruptible(&dev->v4l_lock)) return -ERESTARTSYS; - /* - * Once URBs are cancelled, the URB complete handler - * won't be running. This is required to safely release the - * current buffer (dev->isoc_ctl.buf). - */ stk1160_cancel_isoc(dev); /* @@ -629,16 +624,8 @@ stk1160_info("buffer [%p/%d] aborted\n", buf, buf->vb.v4l2_buf.index); } + /* It's important to clear current buffer */ + dev->isoc_ctl.buf = NULL; - - /* It's important to release the current buffer */ - if (dev->isoc_ctl.buf) { - buf = dev->isoc_ctl.buf; - dev->isoc_ctl.buf = NULL; - - vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); - stk1160_info("buffer [%p/%d] aborted\n", - buf, buf->vb.v4l2_buf.index); - } spin_unlock_irqrestore(&dev->buf_lock, flags); } reverted: --- linux-3.13.0/drivers/memstick/core/mspro_block.c +++ linux-3.13.0.orig/drivers/memstick/core/mspro_block.c @@ -758,7 +758,7 @@ if (error || (card->current_mrq.tpc == MSPRO_CMD_STOP)) { if (msb->data_dir == READ) { + for (cnt = 0; cnt < msb->current_seg; cnt++) - for (cnt = 0; cnt < msb->current_seg; cnt++) { t_len += msb->req_sg[cnt].length / msb->page_size; @@ -766,7 +766,6 @@ t_len += msb->current_page - 1; t_len *= msb->page_size; - } } } else t_len = blk_rq_bytes(msb->block_req); reverted: --- linux-3.13.0/drivers/mtd/ubi/attach.c +++ linux-3.13.0.orig/drivers/mtd/ubi/attach.c @@ -408,7 +408,7 @@ second_is_newer = !second_is_newer; } else { dbg_bld("PEB %d CRC is OK", pnum); + bitflips = !!err; - bitflips |= !!err; } mutex_unlock(&ubi->buf_mutex); reverted: --- linux-3.13.0/drivers/mtd/ubi/cdev.c +++ linux-3.13.0.orig/drivers/mtd/ubi/cdev.c @@ -451,7 +451,7 @@ /* Validate the request */ err = -EINVAL; if (req.lnum < 0 || req.lnum >= vol->reserved_pebs || + req.bytes < 0 || req.lnum >= vol->usable_leb_size) - req.bytes < 0 || req.bytes > vol->usable_leb_size) break; err = get_exclusive(desc); reverted: --- linux-3.13.0/drivers/mtd/ubi/eba.c +++ linux-3.13.0.orig/drivers/mtd/ubi/eba.c @@ -1362,8 +1362,7 @@ * during re-size. */ ubi_move_aeb_to_list(av, aeb, &ai->erase); + vol->eba_tbl[aeb->lnum] = aeb->pnum; - else - vol->eba_tbl[aeb->lnum] = aeb->pnum; } } diff -u linux-3.13.0/drivers/mtd/ubi/wl.c linux-3.13.0/drivers/mtd/ubi/wl.c --- linux-3.13.0/drivers/mtd/ubi/wl.c +++ linux-3.13.0/drivers/mtd/ubi/wl.c @@ -995,7 +995,7 @@ int cancel) { int err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0; - int vol_id = -1, lnum = -1; + int vol_id = -1, uninitialized_var(lnum); #ifdef CONFIG_MTD_UBI_FASTMAP int anchor = wrk->anchor; #endif diff -u linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h --- linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h +++ linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h @@ -97,8 +97,6 @@ #define QCOHERENT BIT(4) #define RECOMBBUF BIT(27) -#define MAC_OFFSET 0x30 - #define BLOCK_ETH_CSR_OFFSET 0x2000 #define BLOCK_ETH_RING_IF_OFFSET 0x9000 #define BLOCK_ETH_DIAG_CSR_OFFSET 0xD000 diff -u linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.c linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.c --- linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -630,11 +630,9 @@ struct device *dev = ndev_to_dev(ndev); struct xgene_enet_desc_ring *rx_ring, *tx_ring, *cp_ring; struct xgene_enet_desc_ring *buf_pool = NULL; - u8 cpu_bufnum = pdata->cpu_bufnum; - u8 eth_bufnum = pdata->eth_bufnum; - u8 bp_bufnum = pdata->bp_bufnum; - u16 ring_num = pdata->ring_num; - u16 ring_id; + u8 cpu_bufnum = 0, eth_bufnum = START_ETH_BUFNUM; + u8 bp_bufnum = START_BP_BUFNUM; + u16 ring_id, ring_num = START_RING_NUM; int ret; /* allocate rx descriptor ring */ @@ -739,57 +737,6 @@ .ndo_set_mac_address = xgene_enet_set_mac_address, }; -static int xgene_get_port_id(struct device *dev, struct xgene_enet_pdata *pdata) -{ - u32 id = 0; - int ret; - - ret = of_property_read_u32(dev->of_node, "port-id", &id); - if (!ret && id > 1) { - dev_err(dev, "Incorrect port-id specified\n"); - return -ENODEV; - } - - pdata->port_id = id; - - return 0; -} - -static int xgene_get_mac_address(struct device *dev, - unsigned char *addr) -{ - int ret; - - ret = of_property_read_u8_array(dev->of_node, "local-mac-address", addr, 6); - if (ret) - ret = of_property_read_u8_array(dev->of_node, "mac-address", - addr, 6); - if (ret) - return -ENODEV; - - return ETH_ALEN; -} - -static int xgene_get_phy_mode(struct device *dev) -{ - int i, ret; - char *modestr; - - ret = of_property_read_string(dev->of_node, "phy-connection-type", - (const char **)&modestr); - if (ret) - ret = of_property_read_string(dev->of_node, "phy-mode", - (const char **)&modestr); - if (ret) - return -ENODEV; - - for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) { - if (!strcasecmp(modestr, phy_modes(i))) - return i; - } - return -ENODEV; -} - static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) { struct platform_device *pdev; @@ -809,10 +756,10 @@ dev_err(dev, "Resource enet_csr not defined\n"); return -ENODEV; } - pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res)); - if (!pdata->base_addr) { + pdata->base_addr = devm_ioremap_resource(dev, res); + if (IS_ERR(pdata->base_addr)) { dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); - return -ENOMEM; + return PTR_ERR(pdata->base_addr); } res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr"); @@ -820,11 +767,10 @@ dev_err(dev, "Resource ring_csr not defined\n"); return -ENODEV; } - pdata->ring_csr_addr = devm_ioremap(dev, res->start, - resource_size(res)); - if (!pdata->ring_csr_addr) { + pdata->ring_csr_addr = devm_ioremap_resource(dev, res); + if (IS_ERR(pdata->ring_csr_addr)) { dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); - return -ENOMEM; + return PTR_ERR(pdata->ring_csr_addr); } res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd"); @@ -832,11 +778,10 @@ dev_err(dev, "Resource ring_cmd not defined\n"); return -ENODEV; } - pdata->ring_cmd_addr = devm_ioremap(dev, res->start, - resource_size(res)); - if (!pdata->ring_cmd_addr) { + pdata->ring_cmd_addr = devm_ioremap_resource(dev, res); + if (IS_ERR(pdata->ring_cmd_addr)) { dev_err(dev, "Unable to retrieve ENET Ring command region\n"); - return -ENOMEM; + return PTR_ERR(pdata->ring_cmd_addr); } ret = platform_get_irq(pdev, 0); @@ -847,11 +792,10 @@ } pdata->rx_irq = ret; - ret = xgene_get_port_id(dev, pdata); - if (ret) - return ret; - - if (xgene_get_mac_address(dev, ndev->dev_addr) != ETH_ALEN) + mac = of_get_mac_address(dev->of_node); + if (mac) + memcpy(ndev->dev_addr, mac, ndev->addr_len); + else eth_hw_addr_random(ndev); memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); @@ -875,13 +819,13 @@ return ret; } - base_addr = pdata->base_addr - (pdata->port_id * MAC_OFFSET); + base_addr = pdata->base_addr; pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET; pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET; pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET; if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII || pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) { - pdata->mcx_mac_addr = pdata->base_addr + BLOCK_ETH_MAC_OFFSET; + pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET; pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET; } else { pdata->mcx_mac_addr = base_addr + BLOCK_AXG_MAC_OFFSET; @@ -944,24 +888,6 @@ pdata->rm = RM0; break; } - - switch (pdata->port_id) { - case 0: - pdata->cpu_bufnum = START_CPU_BUFNUM_0; - pdata->eth_bufnum = START_ETH_BUFNUM_0; - pdata->bp_bufnum = START_BP_BUFNUM_0; - pdata->ring_num = START_RING_NUM_0; - break; - case 1: - pdata->cpu_bufnum = START_CPU_BUFNUM_1; - pdata->eth_bufnum = START_ETH_BUFNUM_1; - pdata->bp_bufnum = START_BP_BUFNUM_1; - pdata->ring_num = START_RING_NUM_1; - break; - default: - break; - } - } static int xgene_enet_probe(struct platform_device *pdev) @@ -1049,10 +975,8 @@ return 0; } -static const struct of_device_id xgene_enet_match[] = { +static struct of_device_id xgene_enet_match[] = { {.compatible = "apm,xgene-enet",}, - {.compatible = "apm,xgene1-sgenet",}, - {.compatible = "apm,xgene1-xgenet",}, {}, }; diff -u linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.h linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.h --- linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -40,15 +39,9 @@ #define SKB_BUFFER_SIZE (XGENE_ENET_MAX_MTU - NET_IP_ALIGN) #define NUM_PKT_BUF 64 #define NUM_BUFPOOL 32 - -#define START_CPU_BUFNUM_0 0 -#define START_ETH_BUFNUM_0 2 -#define START_BP_BUFNUM_0 0x22 -#define START_RING_NUM_0 8 -#define START_CPU_BUFNUM_1 12 -#define START_ETH_BUFNUM_1 10 -#define START_BP_BUFNUM_1 0x2A -#define START_RING_NUM_1 264 +#define START_ETH_BUFNUM 2 +#define START_BP_BUFNUM 0x22 +#define START_RING_NUM 8 #define PHY_POLL_LINK_ON (10 * HZ) #define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5) @@ -130,11 +123,6 @@ struct xgene_mac_ops *mac_ops; struct xgene_port_ops *port_ops; struct delayed_work link_work; - u32 port_id; - u8 cpu_bufnum; - u8 eth_bufnum; - u8 bp_bufnum; - u16 ring_num; }; struct xgene_indirect_ctl { diff -u linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c --- linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c +++ linux-3.13.0/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c @@ -226,7 +226,6 @@ static void xgene_sgmac_init(struct xgene_enet_pdata *p) { u32 data, loop = 10; - u32 offset = p->port_id * 4; xgene_sgmac_reset(p); @@ -273,9 +272,9 @@ xgene_enet_wr_csr(p, RSIF_RAM_DBG_REG0_ADDR, 0); /* Bypass traffic gating */ - xgene_enet_wr_csr(p, CFG_LINK_AGGR_RESUME_0_ADDR + offset, TX_PORT0); + xgene_enet_wr_csr(p, CFG_LINK_AGGR_RESUME_0_ADDR, TX_PORT0); xgene_enet_wr_csr(p, CFG_BYPASS_ADDR, RESUME_TX); - xgene_enet_wr_csr(p, SG_RX_DV_GATE_REG_0_ADDR + offset, RESUME_RX0); + xgene_enet_wr_csr(p, SG_RX_DV_GATE_REG_0_ADDR, RESUME_RX0); } static void xgene_sgmac_rxtx(struct xgene_enet_pdata *p, u32 bits, bool set) @@ -331,14 +330,13 @@ u32 dst_ring_num, u16 bufpool_id) { u32 data, fpsel; - u32 offset = p->port_id * MAC_OFFSET; data = CFG_CLE_BYPASS_EN0; - xgene_enet_wr_csr(p, CLE_BYPASS_REG0_0_ADDR + offset, data); + xgene_enet_wr_csr(p, CLE_BYPASS_REG0_0_ADDR, data); fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20; data = CFG_CLE_DSTQID0(dst_ring_num) | CFG_CLE_FPSEL0(fpsel); - xgene_enet_wr_csr(p, CLE_BYPASS_REG1_0_ADDR + offset, data); + xgene_enet_wr_csr(p, CLE_BYPASS_REG1_0_ADDR, data); } static void xgene_enet_shutdown(struct xgene_enet_pdata *p) reverted: --- linux-3.13.0/drivers/net/ethernet/intel/e1000/e1000_main.c +++ linux-3.13.0.orig/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -144,11 +144,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, struct e1000_rx_ring *rx_ring, int *work_done, int work_to_do); -static void e1000_alloc_dummy_rx_buffers(struct e1000_adapter *adapter, - struct e1000_rx_ring *rx_ring, - int cleaned_count) -{ -} static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter, struct e1000_rx_ring *rx_ring, int cleaned_count); @@ -3536,11 +3531,8 @@ msleep(1); /* e1000_down has a dependency on max_frame_size */ hw->max_frame_size = max_frame; + if (netif_running(netdev)) - if (netif_running(netdev)) { - /* prevent buffers from being reallocated */ - adapter->alloc_rx_buf = e1000_alloc_dummy_rx_buffers; e1000_down(adapter); - } /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN * means we reserve 2 more, this pushes us to allocate from the next diff -u linux-3.13.0/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c linux-3.13.0/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c --- linux-3.13.0/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ linux-3.13.0/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c @@ -211,28 +211,26 @@ return 0; } -#define MLX5_U64_4K_PAGE_MASK ((~(u64)0U) << PAGE_SHIFT) - static void free_4k(struct mlx5_core_dev *dev, u64 addr) { struct fw_page *fwp; int n; - fwp = find_fw_page(dev, addr & MLX5_U64_4K_PAGE_MASK); + fwp = find_fw_page(dev, addr & PAGE_MASK); if (!fwp) { mlx5_core_warn(dev, "page not found\n"); return; } - n = (addr & ~MLX5_U64_4K_PAGE_MASK) >> MLX5_ADAPTER_PAGE_SHIFT; + n = (addr & ~PAGE_MASK) >> MLX5_ADAPTER_PAGE_SHIFT; fwp->free_count++; set_bit(n, &fwp->bitmask); if (fwp->free_count == MLX5_NUM_4K_IN_PAGE) { rb_erase(&fwp->rb_node, &dev->priv.page_root); if (fwp->free_count != 1) list_del(&fwp->list); - dma_unmap_page(&dev->pdev->dev, addr & MLX5_U64_4K_PAGE_MASK, - PAGE_SIZE, DMA_BIDIRECTIONAL); + dma_unmap_page(&dev->pdev->dev, addr & PAGE_MASK, PAGE_SIZE, + DMA_BIDIRECTIONAL); __free_page(fwp->page); kfree(fwp); } else if (fwp->free_count == 1) { diff -u linux-3.13.0/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linux-3.13.0/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c --- linux-3.13.0/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +++ linux-3.13.0/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c @@ -370,7 +370,6 @@ {RTL_USB_DEVICE(0x2001, 0x3307, rtl92cu_hal_cfg)}, /*D-Link-Cameo*/ {RTL_USB_DEVICE(0x2001, 0x3309, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/ {RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/ - {RTL_USB_DEVICE(0x2001, 0x330d, rtl92cu_hal_cfg)}, /*D-Link DWA-131 */ {RTL_USB_DEVICE(0x2019, 0xab2b, rtl92cu_hal_cfg)}, /*Planex -Abocom*/ {RTL_USB_DEVICE(0x20f4, 0x624d, rtl92cu_hal_cfg)}, /*TRENDNet*/ {RTL_USB_DEVICE(0x2357, 0x0100, rtl92cu_hal_cfg)}, /*TP-Link WN8200ND*/ reverted: --- linux-3.13.0/drivers/net/wireless/ti/wl18xx/debugfs.c +++ linux-3.13.0.orig/drivers/net/wireless/ti/wl18xx/debugfs.c @@ -136,7 +136,7 @@ WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, accum_arp_pend_requests, "%u"); WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, max_arp_queue_dep, "%u"); +WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u"); -WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(rx_rate, rx_frames_per_rates, 50); WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, tx_agg_vs_rate, AGGR_STATS_TX_AGG*AGGR_STATS_TX_RATE); reverted: --- linux-3.13.0/drivers/net/wireless/ti/wlcore/debugfs.h +++ linux-3.13.0.orig/drivers/net/wireless/ti/wlcore/debugfs.h @@ -26,8 +26,8 @@ #include "wlcore.h" +int wl1271_format_buffer(char __user *userbuf, size_t count, + loff_t *ppos, char *fmt, ...); -__printf(4, 5) int wl1271_format_buffer(char __user *userbuf, size_t count, - loff_t *ppos, char *fmt, ...); int wl1271_debugfs_init(struct wl1271 *wl); void wl1271_debugfs_exit(struct wl1271 *wl); diff -u linux-3.13.0/drivers/of/of_net.c linux-3.13.0/drivers/of/of_net.c --- linux-3.13.0/drivers/of/of_net.c +++ linux-3.13.0/drivers/of/of_net.c @@ -12,6 +12,28 @@ #include /** + * It maps 'enum phy_interface_t' found in include/linux/phy.h + * into the device tree binding of 'phy-mode' or 'phy-connection-type', + * so that Ethernet device driver can get phy interface from device tree. + */ +static const char *phy_modes[] = { + [PHY_INTERFACE_MODE_NA] = "", + [PHY_INTERFACE_MODE_MII] = "mii", + [PHY_INTERFACE_MODE_GMII] = "gmii", + [PHY_INTERFACE_MODE_SGMII] = "sgmii", + [PHY_INTERFACE_MODE_TBI] = "tbi", + [PHY_INTERFACE_MODE_REVMII] = "rev-mii", + [PHY_INTERFACE_MODE_RMII] = "rmii", + [PHY_INTERFACE_MODE_RGMII] = "rgmii", + [PHY_INTERFACE_MODE_RGMII_ID] = "rgmii-id", + [PHY_INTERFACE_MODE_RGMII_RXID] = "rgmii-rxid", + [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid", + [PHY_INTERFACE_MODE_RTBI] = "rtbi", + [PHY_INTERFACE_MODE_SMII] = "smii", + [PHY_INTERFACE_MODE_XGMII] = "xgmii", +}; + +/** * of_get_phy_mode - Get phy mode for given device_node * @np: Pointer to the given device_node * @@ -30,8 +52,8 @@ if (err < 0) return err; - for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) - if (!strcasecmp(pm, phy_modes(i))) + for (i = 0; i < ARRAY_SIZE(phy_modes); i++) + if (!strcasecmp(pm, phy_modes[i])) return i; return -ENODEV; reverted: --- linux-3.13.0/drivers/platform/x86/compal-laptop.c +++ linux-3.13.0.orig/drivers/platform/x86/compal-laptop.c @@ -1049,13 +1049,7 @@ /* Power supply */ initialize_power_supply_data(data); + power_supply_register(&compal_device->dev, &data->psy); - err = power_supply_register(&compal_device->dev, &data->psy); - if (err < 0) { - hwmon_device_unregister(data->hwmon_dev); - sysfs_remove_group(&pdev->dev.kobj, &compal_attribute_group); - kfree(data); - return err; - } platform_set_drvdata(pdev, data); reverted: --- linux-3.13.0/drivers/power/lp8788-charger.c +++ linux-3.13.0.orig/drivers/power/lp8788-charger.c @@ -417,10 +417,8 @@ pchg->battery.num_properties = ARRAY_SIZE(lp8788_battery_prop); pchg->battery.get_property = lp8788_battery_get_property; + if (power_supply_register(&pdev->dev, &pchg->battery)) - if (power_supply_register(&pdev->dev, &pchg->battery)) { - power_supply_unregister(&pchg->charger); return -EPERM; - } return 0; } reverted: --- linux-3.13.0/drivers/power/twl4030_madc_battery.c +++ linux-3.13.0.orig/drivers/power/twl4030_madc_battery.c @@ -192,7 +192,6 @@ { struct twl4030_madc_battery *twl4030_madc_bat; struct twl4030_madc_bat_platform_data *pdata = pdev->dev.platform_data; - int ret = 0; twl4030_madc_bat = kzalloc(sizeof(*twl4030_madc_bat), GFP_KERNEL); if (!twl4030_madc_bat) @@ -217,11 +216,9 @@ twl4030_madc_bat->pdata = pdata; platform_set_drvdata(pdev, twl4030_madc_bat); + power_supply_register(&pdev->dev, &twl4030_madc_bat->psy); - ret = power_supply_register(&pdev->dev, &twl4030_madc_bat->psy); - if (ret < 0) - kfree(twl4030_madc_bat); + return 0; - return ret; } static int twl4030_madc_battery_remove(struct platform_device *pdev) reverted: --- linux-3.13.0/drivers/scsi/mvsas/mv_sas.c +++ linux-3.13.0.orig/drivers/scsi/mvsas/mv_sas.c @@ -441,11 +441,14 @@ static int mvs_task_prep_ata(struct mvs_info *mvi, struct mvs_task_exec_info *tei) { + struct sas_ha_struct *sha = mvi->sas; struct sas_task *task = tei->task; struct domain_device *dev = task->dev; struct mvs_device *mvi_dev = dev->lldd_dev; struct mvs_cmd_hdr *hdr = tei->hdr; struct asd_sas_port *sas_port = dev->port; + struct sas_phy *sphy = dev->phy; + struct asd_sas_phy *sas_phy = sha->sas_phy[sphy->number]; struct mvs_slot_info *slot; void *buf_prd; u32 tag = tei->tag, hdr_tag; @@ -465,7 +468,7 @@ slot->tx = mvi->tx_prod; del_q = TXQ_MODE_I | tag | (TXQ_CMD_STP << TXQ_CMD_SHIFT) | + (MVS_PHY_ID << TXQ_PHY_SHIFT) | - ((sas_port->phy_mask & TXQ_PHY_MASK) << TXQ_PHY_SHIFT) | (mvi_dev->taskfileset << TXQ_SRS_SHIFT); mvi->tx[mvi->tx_prod] = cpu_to_le32(del_q); diff -u linux-3.13.0/drivers/scsi/scsi_lib.c linux-3.13.0/drivers/scsi/scsi_lib.c --- linux-3.13.0/drivers/scsi/scsi_lib.c +++ linux-3.13.0/drivers/scsi/scsi_lib.c @@ -787,7 +787,7 @@ int sense_deferred = 0; enum {ACTION_FAIL, ACTION_REPREP, ACTION_RETRY, ACTION_DELAYED_RETRY} action; - unsigned long wait_for = (cmd->allowed + 1) * req->timeout; + char *description = NULL; if (result) { sense_valid = scsi_command_normalize_sense(cmd, &sshdr); @@ -896,6 +896,7 @@ * and quietly refuse further access. */ cmd->device->changed = 1; + description = "Media Changed"; action = ACTION_FAIL; } else { /* Must have been a power glitch, or a @@ -923,10 +924,27 @@ cmd->device->use_10_for_rw = 0; action = ACTION_REPREP; } else if (sshdr.asc == 0x10) /* DIX */ { + description = "Host Data Integrity Failure"; action = ACTION_FAIL; error = -EILSEQ; /* INVALID COMMAND OPCODE or INVALID FIELD IN CDB */ } else if (sshdr.asc == 0x20 || sshdr.asc == 0x24) { + switch (cmd->cmnd[0]) { + case UNMAP: + description = "Discard failure"; + break; + case WRITE_SAME: + case WRITE_SAME_16: + if (cmd->cmnd[1] & 0x8) + description = "Discard failure"; + else + description = + "Write same failure"; + break; + default: + description = "Invalid command failure"; + break; + } action = ACTION_FAIL; error = -EREMOTEIO; } else @@ -934,8 +952,10 @@ break; case ABORTED_COMMAND: action = ACTION_FAIL; - if (sshdr.asc == 0x10) /* DIF */ + if (sshdr.asc == 0x10) { /* DIF */ + description = "Target Data Integrity Failure"; error = -EILSEQ; + } break; case NOT_READY: /* If the device is in the process of becoming @@ -954,32 +974,37 @@ action = ACTION_DELAYED_RETRY; break; default: + description = "Device not ready"; action = ACTION_FAIL; break; } - } else + } else { + description = "Device not ready"; action = ACTION_FAIL; + } break; case VOLUME_OVERFLOW: /* See SSC3rXX or current. */ action = ACTION_FAIL; break; default: + description = "Unhandled sense code"; action = ACTION_FAIL; break; } - } else - action = ACTION_FAIL; - - if (action != ACTION_FAIL && - time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) + } else { + description = "Unhandled error code"; action = ACTION_FAIL; + } switch (action) { case ACTION_FAIL: /* Give up and fail the remainder of the request */ scsi_release_buffers(cmd); if (!(req->cmd_flags & REQ_QUIET)) { + if (description) + scmd_printk(KERN_INFO, cmd, "%s\n", + description); scsi_print_result(cmd); if (driver_byte(result) & DRIVER_SENSE) scsi_print_sense("", cmd); diff -u linux-3.13.0/drivers/scsi/storvsc_drv.c linux-3.13.0/drivers/scsi/storvsc_drv.c --- linux-3.13.0/drivers/scsi/storvsc_drv.c +++ linux-3.13.0/drivers/scsi/storvsc_drv.c @@ -741,22 +741,21 @@ if (bounce_sgl[j].length == PAGE_SIZE) { /* full..move to next entry */ sg_kunmap_atomic(bounce_addr); - bounce_addr = 0; j++; - } - /* if we need to use another bounce buffer */ - if (srclen && bounce_addr == 0) - bounce_addr = sg_kmap_atomic(bounce_sgl, j); + /* if we need to use another bounce buffer */ + if (srclen || i != orig_sgl_count - 1) + bounce_addr = sg_kmap_atomic(bounce_sgl,j); + } else if (srclen == 0 && i == orig_sgl_count - 1) { + /* unmap the last bounce that is < PAGE_SIZE */ + sg_kunmap_atomic(bounce_addr); + } } sg_kunmap_atomic(src_addr - orig_sgl[i].offset); } - if (bounce_addr) - sg_kunmap_atomic(bounce_addr); - local_irq_restore(flags); return total_copied; reverted: --- linux-3.13.0/drivers/staging/dwc2/hcd.c +++ linux-3.13.0.orig/drivers/staging/dwc2/hcd.c @@ -1487,7 +1487,7 @@ dev_dbg(hsotg->dev, "ClearPortFeature USB_PORT_FEAT_SUSPEND\n"); writel(0, hsotg->regs + PCGCTL); + usleep_range(20000, 40000); - msleep(USB_RESUME_TIMEOUT); hprt0 = dwc2_read_hprt0(hsotg); hprt0 |= HPRT0_RES; reverted: --- linux-3.13.0/drivers/staging/ozwpan/ozhcd.c +++ linux-3.13.0.orig/drivers/staging/ozwpan/ozhcd.c @@ -799,8 +799,8 @@ /* * Context: softirq */ +void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status, const u8 *desc, + int length, int offset, int total_size) -void oz_hcd_get_desc_cnf(void *hport, u8 req_id, u8 status, const u8 *desc, - u8 length, u16 offset, u16 total_size) { struct oz_port *port = (struct oz_port *)hport; struct urb *urb; @@ -812,8 +812,8 @@ if (!urb) return; if (status == 0) { + int copy_len; + int required_size = urb->transfer_buffer_length; - unsigned int copy_len; - unsigned int required_size = urb->transfer_buffer_length; if (required_size > total_size) required_size = total_size; copy_len = required_size-offset; reverted: --- linux-3.13.0/drivers/staging/ozwpan/ozusbif.h +++ linux-3.13.0.orig/drivers/staging/ozwpan/ozusbif.h @@ -29,8 +29,8 @@ /* Confirmation functions. */ +void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status, + const u8 *desc, int length, int offset, int total_size); -void oz_hcd_get_desc_cnf(void *hport, u8 req_id, u8 status, - const u8 *desc, u8 length, u16 offset, u16 total_size); void oz_hcd_control_cnf(void *hport, u8 req_id, u8 rcode, const u8 *data, int data_len); reverted: --- linux-3.13.0/drivers/staging/ozwpan/ozusbsvc1.c +++ linux-3.13.0.orig/drivers/staging/ozwpan/ozusbsvc1.c @@ -324,11 +324,7 @@ struct oz_multiple_fixed *body = (struct oz_multiple_fixed *)data_hdr; u8 *data = body->data; + int n = (len - sizeof(struct oz_multiple_fixed)+1) - unsigned int n; - if (!body->unit_size || - len < sizeof(struct oz_multiple_fixed) - 1) - break; - n = (len - (sizeof(struct oz_multiple_fixed) - 1)) / body->unit_size; while (n--) { oz_hcd_data_ind(usb_ctx->hport, body->endpoint, @@ -391,15 +387,10 @@ case OZ_GET_DESC_RSP: { struct oz_get_desc_rsp *body = (struct oz_get_desc_rsp *)usb_hdr; + int data_len = elt->length - + sizeof(struct oz_get_desc_rsp) + 1; + u16 offs = le16_to_cpu(get_unaligned(&body->offset)); + u16 total_size = - u16 offs, total_size; - u8 data_len; - - if (elt->length < sizeof(struct oz_get_desc_rsp) - 1) - break; - data_len = elt->length - - (sizeof(struct oz_get_desc_rsp) - 1); - offs = le16_to_cpu(get_unaligned(&body->offset)); - total_size = le16_to_cpu(get_unaligned(&body->total_size)); oz_dbg(ON, "USB_REQ_GET_DESCRIPTOR - cnf\n"); oz_hcd_get_desc_cnf(usb_ctx->hport, body->req_id, reverted: --- linux-3.13.0/drivers/staging/panel/panel.c +++ linux-3.13.0.orig/drivers/staging/panel/panel.c @@ -275,11 +275,11 @@ * LCD types */ #define LCD_TYPE_NONE 0 +#define LCD_TYPE_OLD 1 +#define LCD_TYPE_KS0074 2 +#define LCD_TYPE_HANTRONIX 3 +#define LCD_TYPE_NEXCOM 4 +#define LCD_TYPE_CUSTOM 5 -#define LCD_TYPE_CUSTOM 1 -#define LCD_TYPE_OLD 2 -#define LCD_TYPE_KS0074 3 -#define LCD_TYPE_HANTRONIX 4 -#define LCD_TYPE_NEXCOM 5 /* * keypad types @@ -457,7 +457,8 @@ static int lcd_type = -1; module_param(lcd_type, int, 0000); MODULE_PARM_DESC(lcd_type, + "LCD type: 0=none, 1=old //, 2=serial ks0074, " + "3=hantronix //, 4=nexcom //, 5=compiled-in"); - "LCD type: 0=none, 1=compiled-in, 2=old, 3=serial ks0074, 4=hantronix, 5=nexcom"); static int lcd_proto = -1; module_param(lcd_proto, int, 0000); diff -u linux-3.13.0/drivers/target/iscsi/iscsi_target.c linux-3.13.0/drivers/target/iscsi/iscsi_target.c --- linux-3.13.0/drivers/target/iscsi/iscsi_target.c +++ linux-3.13.0/drivers/target/iscsi/iscsi_target.c @@ -517,7 +517,7 @@ static int __init iscsi_target_init_module(void) { - int ret = 0, size; + int ret = 0; pr_debug("iSCSI-Target "ISCSIT_VERSION"\n"); @@ -526,7 +526,6 @@ pr_err("Unable to allocate memory for iscsit_global\n"); return -1; } - spin_lock_init(&iscsit_global->ts_bitmap_lock); mutex_init(&auth_id_lock); spin_lock_init(&sess_idr_lock); idr_init(&tiqn_idr); @@ -536,11 +535,15 @@ if (ret < 0) goto out; - size = BITS_TO_LONGS(ISCSIT_BITMAP_BITS) * sizeof(long); - iscsit_global->ts_bitmap = vzalloc(size); - if (!iscsit_global->ts_bitmap) { - pr_err("Unable to allocate iscsit_global->ts_bitmap\n"); + ret = iscsi_thread_set_init(); + if (ret < 0) goto configfs_out; + + if (iscsi_allocate_thread_sets(TARGET_THREAD_SET_COUNT) != + TARGET_THREAD_SET_COUNT) { + pr_err("iscsi_allocate_thread_sets() returned" + " unexpected value!\n"); + goto ts_out1; } lio_qr_cache = kmem_cache_create("lio_qr_cache", @@ -549,7 +552,7 @@ if (!lio_qr_cache) { pr_err("nable to kmem_cache_create() for" " lio_qr_cache\n"); - goto bitmap_out; + goto ts_out2; } lio_dr_cache = kmem_cache_create("lio_dr_cache", @@ -593,8 +596,10 @@ kmem_cache_destroy(lio_dr_cache); qr_out: kmem_cache_destroy(lio_qr_cache); -bitmap_out: - vfree(iscsit_global->ts_bitmap); +ts_out2: + iscsi_deallocate_thread_sets(); +ts_out1: + iscsi_thread_set_free(); configfs_out: iscsi_target_deregister_configfs(); out: @@ -604,6 +609,8 @@ static void __exit iscsi_target_cleanup_module(void) { + iscsi_deallocate_thread_sets(); + iscsi_thread_set_free(); iscsit_release_discovery_tpg(); iscsit_unregister_transport(&iscsi_target_transport); kmem_cache_destroy(lio_qr_cache); @@ -613,7 +620,6 @@ iscsi_target_deregister_configfs(); - vfree(iscsit_global->ts_bitmap); kfree(iscsit_global); } @@ -3646,16 +3652,17 @@ void iscsit_thread_get_cpumask(struct iscsi_conn *conn) { + struct iscsi_thread_set *ts = conn->thread_set; int ord, cpu; /* - * bitmap_id is assigned from iscsit_global->ts_bitmap from - * within iscsit_start_kthreads() + * thread_id is assigned from iscsit_global->ts_bitmap from + * within iscsi_thread_set.c:iscsi_allocate_thread_sets() * - * Here we use bitmap_id to determine which CPU that this - * iSCSI connection's RX/TX threads will be scheduled to + * Here we use thread_id to determine which CPU that this + * iSCSI connection's iscsi_thread_set will be scheduled to * execute upon. */ - ord = conn->bitmap_id % cpumask_weight(cpu_online_mask); + ord = ts->thread_id % cpumask_weight(cpu_online_mask); for_each_online_cpu(cpu) { if (ord-- == 0) { cpumask_set_cpu(cpu, conn->conn_cpumask); @@ -3847,7 +3854,7 @@ switch (state) { case ISTATE_SEND_LOGOUTRSP: if (!iscsit_logout_post_handler(cmd, conn)) - return -ECONNRESET; + goto restart; /* fall through */ case ISTATE_SEND_STATUS: case ISTATE_SEND_ASYNCMSG: @@ -3875,6 +3882,8 @@ err: return -1; +restart: + return -EAGAIN; } static int iscsit_handle_response_queue(struct iscsi_conn *conn) @@ -3901,13 +3910,21 @@ int iscsi_target_tx_thread(void *arg) { int ret = 0; - struct iscsi_conn *conn = arg; + struct iscsi_conn *conn; + struct iscsi_thread_set *ts = arg; /* * Allow ourselves to be interrupted by SIGINT so that a * connection recovery / failure event can be triggered externally. */ allow_signal(SIGINT); +restart: + conn = iscsi_tx_thread_pre_handler(ts); + if (!conn) + goto out; + + ret = 0; + while (!kthread_should_stop()) { /* * Ensure that both TX and RX per connection kthreads @@ -3916,9 +3933,11 @@ iscsit_thread_check_cpumask(conn, current, 1); wait_event_interruptible(conn->queues_wq, - !iscsit_conn_all_queues_empty(conn)); + !iscsit_conn_all_queues_empty(conn) || + ts->status == ISCSI_THREAD_SET_RESET); - if (signal_pending(current)) + if ((ts->status == ISCSI_THREAD_SET_RESET) || + signal_pending(current)) goto transport_err; get_immediate: @@ -3929,14 +3948,15 @@ ret = iscsit_handle_response_queue(conn); if (ret == 1) goto get_immediate; - else if (ret == -ECONNRESET) - goto out; + else if (ret == -EAGAIN) + goto restart; else if (ret < 0) goto transport_err; } transport_err: iscsit_take_action_for_connection_exit(conn); + goto restart; out: return 0; } @@ -4025,7 +4045,8 @@ int ret; u8 buffer[ISCSI_HDR_LEN], opcode; u32 checksum = 0, digest = 0; - struct iscsi_conn *conn = arg; + struct iscsi_conn *conn = NULL; + struct iscsi_thread_set *ts = arg; struct kvec iov; /* * Allow ourselves to be interrupted by SIGINT so that a @@ -4033,6 +4054,11 @@ */ allow_signal(SIGINT); +restart: + conn = iscsi_rx_thread_pre_handler(ts); + if (!conn) + goto out; + if (conn->conn_transport->transport_type == ISCSI_INFINIBAND) { struct completion comp; int rc; @@ -4042,7 +4068,7 @@ if (rc < 0) goto transport_err; - goto transport_err; + goto out; } while (!kthread_should_stop()) { @@ -4118,6 +4144,8 @@ if (!signal_pending(current)) atomic_set(&conn->transport_failed, 1); iscsit_take_action_for_connection_exit(conn); + goto restart; +out: return 0; } @@ -4179,24 +4207,7 @@ if (conn->conn_transport->transport_type == ISCSI_TCP) complete(&conn->conn_logout_comp); - if (!strcmp(current->comm, ISCSI_RX_THREAD_NAME)) { - if (conn->tx_thread && - cmpxchg(&conn->tx_thread_active, true, false)) { - send_sig(SIGINT, conn->tx_thread, 1); - kthread_stop(conn->tx_thread); - } - } else if (!strcmp(current->comm, ISCSI_TX_THREAD_NAME)) { - if (conn->rx_thread && - cmpxchg(&conn->rx_thread_active, true, false)) { - send_sig(SIGINT, conn->rx_thread, 1); - kthread_stop(conn->rx_thread); - } - } - - spin_lock(&iscsit_global->ts_bitmap_lock); - bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id, - get_order(1)); - spin_unlock(&iscsit_global->ts_bitmap_lock); + iscsi_release_thread_set(conn); iscsit_stop_timers_for_cmds(conn); iscsit_stop_nopin_response_timer(conn); @@ -4475,13 +4486,15 @@ struct iscsi_conn *conn) { struct iscsi_session *sess = conn->sess; - int sleep = cmpxchg(&conn->tx_thread_active, true, false); + + iscsi_set_thread_clear(conn, ISCSI_CLEAR_TX_THREAD); + iscsi_set_thread_set_signal(conn, ISCSI_SIGNAL_TX_THREAD); atomic_set(&conn->conn_logout_remove, 0); complete(&conn->conn_logout_comp); iscsit_dec_conn_usage_count(conn); - iscsit_stop_session(sess, sleep, sleep); + iscsit_stop_session(sess, 1, 1); iscsit_dec_session_usage_count(sess); target_put_session(sess->se_sess); } @@ -4489,12 +4502,13 @@ static void iscsit_logout_post_handler_samecid( struct iscsi_conn *conn) { - int sleep = cmpxchg(&conn->tx_thread_active, true, false); + iscsi_set_thread_clear(conn, ISCSI_CLEAR_TX_THREAD); + iscsi_set_thread_set_signal(conn, ISCSI_SIGNAL_TX_THREAD); atomic_set(&conn->conn_logout_remove, 0); complete(&conn->conn_logout_comp); - iscsit_cause_connection_reinstatement(conn, sleep); + iscsit_cause_connection_reinstatement(conn, 1); iscsit_dec_conn_usage_count(conn); } reverted: --- linux-3.13.0/drivers/target/iscsi/iscsi_target_core.h +++ linux-3.13.0.orig/drivers/target/iscsi/iscsi_target_core.h @@ -601,11 +601,6 @@ struct iscsi_session *sess; /* Pointer to thread_set in use for this conn's threads */ struct iscsi_thread_set *thread_set; - int bitmap_id; - int rx_thread_active; - struct task_struct *rx_thread; - int tx_thread_active; - struct task_struct *tx_thread; /* list_head for session connection list */ struct list_head conn_list; } ____cacheline_aligned; @@ -873,12 +868,10 @@ /* Unique identifier used for the authentication daemon */ u32 auth_id; u32 inactive_ts; -#define ISCSIT_BITMAP_BITS 262144 /* Thread Set bitmap count */ int ts_bitmap_count; /* Thread Set bitmap pointer */ unsigned long *ts_bitmap; - spinlock_t ts_bitmap_lock; /* Used for iSCSI discovery session authentication */ struct iscsi_node_acl discovery_acl; struct iscsi_portal_group *discovery_tpg; reverted: --- linux-3.13.0/drivers/target/iscsi/iscsi_target_erl0.c +++ linux-3.13.0.orig/drivers/target/iscsi/iscsi_target_erl0.c @@ -864,10 +864,7 @@ } spin_unlock_bh(&conn->state_lock); + iscsi_thread_set_force_reinstatement(conn); - if (conn->tx_thread && conn->tx_thread_active) - send_sig(SIGINT, conn->tx_thread, 1); - if (conn->rx_thread && conn->rx_thread_active) - send_sig(SIGINT, conn->rx_thread, 1); sleep: wait_for_completion(&conn->conn_wait_rcfr_comp); @@ -892,10 +889,10 @@ return; } + if (iscsi_thread_set_force_reinstatement(conn) < 0) { + spin_unlock_bh(&conn->state_lock); + return; + } - if (conn->tx_thread && conn->tx_thread_active) - send_sig(SIGINT, conn->tx_thread, 1); - if (conn->rx_thread && conn->rx_thread_active) - send_sig(SIGINT, conn->rx_thread, 1); atomic_set(&conn->connection_reinstatement, 1); if (!sleep) { diff -u linux-3.13.0/drivers/target/iscsi/iscsi_target_login.c linux-3.13.0/drivers/target/iscsi/iscsi_target_login.c --- linux-3.13.0/drivers/target/iscsi/iscsi_target_login.c +++ linux-3.13.0/drivers/target/iscsi/iscsi_target_login.c @@ -681,51 +681,6 @@ iscsit_start_nopin_timer(conn); } -int iscsit_start_kthreads(struct iscsi_conn *conn) -{ - int ret = 0; - - spin_lock(&iscsit_global->ts_bitmap_lock); - conn->bitmap_id = bitmap_find_free_region(iscsit_global->ts_bitmap, - ISCSIT_BITMAP_BITS, get_order(1)); - spin_unlock(&iscsit_global->ts_bitmap_lock); - - if (conn->bitmap_id < 0) { - pr_err("bitmap_find_free_region() failed for" - " iscsit_start_kthreads()\n"); - return -ENOMEM; - } - - conn->tx_thread = kthread_run(iscsi_target_tx_thread, conn, - "%s", ISCSI_TX_THREAD_NAME); - if (IS_ERR(conn->tx_thread)) { - pr_err("Unable to start iscsi_target_tx_thread\n"); - ret = PTR_ERR(conn->tx_thread); - goto out_bitmap; - } - conn->tx_thread_active = true; - - conn->rx_thread = kthread_run(iscsi_target_rx_thread, conn, - "%s", ISCSI_RX_THREAD_NAME); - if (IS_ERR(conn->rx_thread)) { - pr_err("Unable to start iscsi_target_rx_thread\n"); - ret = PTR_ERR(conn->rx_thread); - goto out_tx; - } - conn->rx_thread_active = true; - - return 0; -out_tx: - kthread_stop(conn->tx_thread); - conn->tx_thread_active = false; -out_bitmap: - spin_lock(&iscsit_global->ts_bitmap_lock); - bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id, - get_order(1)); - spin_unlock(&iscsit_global->ts_bitmap_lock); - return ret; -} - int iscsi_post_login_handler( struct iscsi_np *np, struct iscsi_conn *conn, @@ -736,7 +691,7 @@ struct se_session *se_sess = sess->se_sess; struct iscsi_portal_group *tpg = sess->tpg; struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; - int rc; + struct iscsi_thread_set *ts; iscsit_inc_conn_usage_count(conn); @@ -751,6 +706,7 @@ /* * SCSI Initiator -> SCSI Target Port Mapping */ + ts = iscsi_get_thread_set(); if (!zero_tsih) { iscsi_set_session_parameters(sess->sess_ops, conn->param_list, 0); @@ -777,11 +733,9 @@ sess->sess_ops->InitiatorName); spin_unlock_bh(&sess->conn_lock); - rc = iscsit_start_kthreads(conn); - if (rc) - return rc; - iscsi_post_login_start_timers(conn); + + iscsi_activate_thread_set(conn, ts); /* * Determine CPU mask to ensure connection's RX and TX kthreads * are scheduled on the same CPU. @@ -838,11 +792,8 @@ " iSCSI Target Portal Group: %hu\n", tpg->nsessions, tpg->tpgt); spin_unlock_bh(&se_tpg->session_lock); - rc = iscsit_start_kthreads(conn); - if (rc) - return rc; - iscsi_post_login_start_timers(conn); + iscsi_activate_thread_set(conn, ts); /* * Determine CPU mask to ensure connection's RX and TX kthreads * are scheduled on the same CPU. diff -u linux-3.13.0/drivers/target/target_core_sbc.c linux-3.13.0/drivers/target/target_core_sbc.c --- linux-3.13.0/drivers/target/target_core_sbc.c +++ linux-3.13.0/drivers/target/target_core_sbc.c @@ -308,7 +308,7 @@ return 0; } -static sense_reason_t xdreadwrite_callback(struct se_cmd *cmd, bool success) +static sense_reason_t xdreadwrite_callback(struct se_cmd *cmd) { unsigned char *buf, *addr; struct scatterlist *sg; @@ -372,7 +372,7 @@ cmd->data_direction); } -static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success) +static sense_reason_t compare_and_write_post(struct se_cmd *cmd) { struct se_device *dev = cmd->se_dev; @@ -395,7 +395,7 @@ return TCM_NO_SENSE; } -static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool success) +static sense_reason_t compare_and_write_callback(struct se_cmd *cmd) { struct se_device *dev = cmd->se_dev; struct scatterlist *write_sg = NULL, *sg; @@ -410,16 +410,11 @@ /* * Handle early failure in transport_generic_request_failure(), - * which will not have taken ->caw_sem yet.. + * which will not have taken ->caw_mutex yet.. */ - if (!success && (!cmd->t_data_sg || !cmd->t_bidi_data_sg)) + if (!cmd->t_data_sg || !cmd->t_bidi_data_sg) return TCM_NO_SENSE; /* - * Handle special case for zero-length COMPARE_AND_WRITE - */ - if (!cmd->data_length) - goto out; - /* * Immediately exit + release dev->caw_sem if command has already * been failed with a non-zero SCSI status. */ diff -u linux-3.13.0/drivers/target/target_core_transport.c linux-3.13.0/drivers/target/target_core_transport.c --- linux-3.13.0/drivers/target/target_core_transport.c +++ linux-3.13.0/drivers/target/target_core_transport.c @@ -1565,11 +1565,11 @@ transport_complete_task_attr(cmd); /* * Handle special case for COMPARE_AND_WRITE failure, where the - * callback is expected to drop the per device ->caw_sem. + * callback is expected to drop the per device ->caw_mutex. */ if ((cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE) && cmd->transport_complete_callback) - cmd->transport_complete_callback(cmd, false); + cmd->transport_complete_callback(cmd); switch (sense_reason) { case TCM_NON_EXISTENT_LUN: @@ -1903,12 +1903,8 @@ if (cmd->transport_complete_callback) { sense_reason_t rc; - rc = cmd->transport_complete_callback(cmd, true); + rc = cmd->transport_complete_callback(cmd); if (!rc && !(cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE_POST)) { - if ((cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE) && - !cmd->data_length) - goto queue_rsp; - return; } else if (rc) { ret = transport_send_check_condition_and_sense(cmd, @@ -1922,7 +1918,6 @@ } } -queue_rsp: switch (cmd->data_direction) { case DMA_FROM_DEVICE: spin_lock(&cmd->se_lun->lun_sep_lock); @@ -2011,16 +2006,6 @@ static inline void transport_free_pages(struct se_cmd *cmd) { if (cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC) { - /* - * Release special case READ buffer payload required for - * SG_TO_MEM_NOALLOC to function with COMPARE_AND_WRITE - */ - if (cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE) { - transport_free_sgl(cmd->t_bidi_data_sg, - cmd->t_bidi_data_nents); - cmd->t_bidi_data_sg = NULL; - cmd->t_bidi_data_nents = 0; - } transport_reset_sgl_orig(cmd); return; } @@ -2169,7 +2154,6 @@ transport_generic_new_cmd(struct se_cmd *cmd) { int ret = 0; - bool zero_flag = !(cmd->se_cmd_flags & SCF_SCSI_DATA_CDB); /* * Determine is the TCM fabric module has already allocated physical @@ -2178,6 +2162,7 @@ */ if (!(cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC) && cmd->data_length) { + bool zero_flag = !(cmd->se_cmd_flags & SCF_SCSI_DATA_CDB); if ((cmd->se_cmd_flags & SCF_BIDI) || (cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE)) { @@ -2200,20 +2185,6 @@ cmd->data_length, zero_flag); if (ret < 0) return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; - } else if ((cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE) && - cmd->data_length) { - /* - * Special case for COMPARE_AND_WRITE with fabrics - * using SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC. - */ - u32 caw_length = cmd->t_task_nolb * - cmd->se_dev->dev_attrib.block_size; - - ret = target_alloc_sgl(&cmd->t_bidi_data_sg, - &cmd->t_bidi_data_nents, - caw_length, zero_flag); - if (ret < 0) - return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; } /* * If this command is not a write we can execute it right here, diff -u linux-3.13.0/drivers/usb/class/cdc-acm.c linux-3.13.0/drivers/usb/class/cdc-acm.c --- linux-3.13.0/drivers/usb/class/cdc-acm.c +++ linux-3.13.0/drivers/usb/class/cdc-acm.c @@ -985,16 +985,11 @@ } while (buflen > 0) { - elength = buffer[0]; - if (!elength) { - dev_err(&intf->dev, "skipping garbage byte\n"); - elength = 1; - goto next_desc; - } if (buffer[1] != USB_DT_CS_INTERFACE) { dev_err(&intf->dev, "skipping garbage\n"); goto next_desc; } + elength = buffer[0]; switch (buffer[2]) { case USB_CDC_UNION_TYPE: /* we've found it */ diff -u linux-3.13.0/drivers/usb/class/cdc-wdm.c linux-3.13.0/drivers/usb/class/cdc-wdm.c --- linux-3.13.0/drivers/usb/class/cdc-wdm.c +++ linux-3.13.0/drivers/usb/class/cdc-wdm.c @@ -245,7 +245,7 @@ case USB_CDC_NOTIFY_RESPONSE_AVAILABLE: dev_dbg(&desc->intf->dev, "NOTIFY_RESPONSE_AVAILABLE received: index %d len %d", - le16_to_cpu(dr->wIndex), le16_to_cpu(dr->wLength)); + dr->wIndex, dr->wLength); break; case USB_CDC_NOTIFY_NETWORK_CONNECTION: @@ -262,9 +262,7 @@ clear_bit(WDM_POLL_RUNNING, &desc->flags); dev_err(&desc->intf->dev, "unknown notification %d received: index %d len %d\n", - dr->bNotificationType, - le16_to_cpu(dr->wIndex), - le16_to_cpu(dr->wLength)); + dr->bNotificationType, dr->wIndex, dr->wLength); goto exit; } @@ -410,7 +408,7 @@ USB_RECIP_INTERFACE); req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND; req->wValue = 0; - req->wIndex = desc->inum; /* already converted */ + req->wIndex = desc->inum; req->wLength = cpu_to_le16(count); set_bit(WDM_IN_USE, &desc->flags); desc->outbuf = buf; @@ -424,7 +422,7 @@ rv = usb_translate_errors(rv); } else { dev_dbg(&desc->intf->dev, "Tx URB has been submitted index=%d", - le16_to_cpu(req->wIndex)); + req->wIndex); } out: usb_autopm_put_interface(desc->intf); @@ -822,7 +820,7 @@ desc->irq->bRequestType = (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE); desc->irq->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE; desc->irq->wValue = 0; - desc->irq->wIndex = desc->inum; /* already converted */ + desc->irq->wIndex = desc->inum; desc->irq->wLength = cpu_to_le16(desc->wMaxCommand); usb_fill_control_urb( diff -u linux-3.13.0/drivers/usb/core/hub.c linux-3.13.0/drivers/usb/core/hub.c --- linux-3.13.0/drivers/usb/core/hub.c +++ linux-3.13.0/drivers/usb/core/hub.c @@ -3280,10 +3280,10 @@ dev_dbg(hub->intfdev, "can't resume port %d, status %d\n", port1, status); } else { - /* drive resume for USB_RESUME_TIMEOUT msec */ + /* drive resume for at least 20 msec */ dev_dbg(&udev->dev, "usb %sresume\n", (PMSG_IS_AUTO(msg) ? "auto-" : "")); - msleep(USB_RESUME_TIMEOUT); + msleep(25); /* Virtual root hubs can trigger on GET_PORT_STATUS to * stop resume signaling. Then finish the resume diff -u linux-3.13.0/drivers/usb/host/ehci-hcd.c linux-3.13.0/drivers/usb/host/ehci-hcd.c --- linux-3.13.0/drivers/usb/host/ehci-hcd.c +++ linux-3.13.0/drivers/usb/host/ehci-hcd.c @@ -795,12 +795,12 @@ ehci->reset_done[i] == 0)) continue; - /* start USB_RESUME_TIMEOUT msec resume signaling from - * this port, and make khubd collect - * PORT_STAT_C_SUSPEND to stop that signaling. + /* start 20 msec resume signaling from this port, + * and make khubd collect PORT_STAT_C_SUSPEND to + * stop that signaling. Use 5 ms extra for safety, + * like usb_port_resume() does. */ - ehci->reset_done[i] = jiffies + - msecs_to_jiffies(USB_RESUME_TIMEOUT); + ehci->reset_done[i] = jiffies + msecs_to_jiffies(25); set_bit(i, &ehci->resuming_ports); ehci_dbg (ehci, "port %d remote wakeup\n", i + 1); usb_hcd_start_port_resume(&hcd->self, i); diff -u linux-3.13.0/drivers/usb/host/ehci-hub.c linux-3.13.0/drivers/usb/host/ehci-hub.c --- linux-3.13.0/drivers/usb/host/ehci-hub.c +++ linux-3.13.0/drivers/usb/host/ehci-hub.c @@ -482,13 +482,10 @@ ehci_writel(ehci, temp, &ehci->regs->port_status [i]); } - /* - * msleep for USB_RESUME_TIMEOUT ms only if code is trying to resume - * port - */ + /* msleep for 20ms only if code is trying to resume port */ if (resume_needed) { spin_unlock_irq(&ehci->lock); - msleep(USB_RESUME_TIMEOUT); + msleep(20); spin_lock_irq(&ehci->lock); if (ehci->shutdown) goto shutdown; @@ -956,7 +953,7 @@ temp &= ~PORT_WAKE_BITS; ehci_writel(ehci, temp | PORT_RESUME, status_reg); ehci->reset_done[wIndex] = jiffies - + msecs_to_jiffies(USB_RESUME_TIMEOUT); + + msecs_to_jiffies(20); set_bit(wIndex, &ehci->resuming_ports); usb_hcd_start_port_resume(&hcd->self, wIndex); break; reverted: --- linux-3.13.0/drivers/usb/host/fotg210-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/fotg210-hcd.c @@ -1651,7 +1651,7 @@ /* resume signaling for 20 msec */ fotg210_writel(fotg210, temp | PORT_RESUME, status_reg); fotg210->reset_done[wIndex] = jiffies + + msecs_to_jiffies(20); - + msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_C_SUSPEND: clear_bit(wIndex, &fotg210->port_c_suspend); reverted: --- linux-3.13.0/drivers/usb/host/fusbh200-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/fusbh200-hcd.c @@ -1610,9 +1610,10 @@ if ((temp & PORT_PE) == 0) goto error; + /* resume signaling for 20 msec */ fusbh200_writel(fusbh200, temp | PORT_RESUME, status_reg); fusbh200->reset_done[wIndex] = jiffies + + msecs_to_jiffies(20); - + msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_C_SUSPEND: clear_bit(wIndex, &fusbh200->port_c_suspend); reverted: --- linux-3.13.0/drivers/usb/host/isp116x-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/isp116x-hcd.c @@ -1488,7 +1488,7 @@ spin_unlock_irq(&isp116x->lock); hcd->state = HC_STATE_RESUMING; + msleep(20); - msleep(USB_RESUME_TIMEOUT); /* Go operational */ spin_lock_irq(&isp116x->lock); diff -u linux-3.13.0/drivers/usb/host/isp1760-hcd.c linux-3.13.0/drivers/usb/host/isp1760-hcd.c --- linux-3.13.0/drivers/usb/host/isp1760-hcd.c +++ linux-3.13.0/drivers/usb/host/isp1760-hcd.c @@ -1895,7 +1895,7 @@ reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_RESUME); priv->reset_done = jiffies + - msecs_to_jiffies(USB_RESUME_TIMEOUT); + msecs_to_jiffies(20); } break; case USB_PORT_FEAT_C_SUSPEND: reverted: --- linux-3.13.0/drivers/usb/host/oxu210hp-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/oxu210hp-hcd.c @@ -2497,12 +2497,11 @@ || oxu->reset_done[i] != 0) continue; + /* start 20 msec resume signaling from this port, + * and make khubd collect PORT_STAT_C_SUSPEND to - /* start USB_RESUME_TIMEOUT resume signaling from this - * port, and make khubd collect PORT_STAT_C_SUSPEND to * stop that signaling. */ + oxu->reset_done[i] = jiffies + msecs_to_jiffies(20); - oxu->reset_done[i] = jiffies + - msecs_to_jiffies(USB_RESUME_TIMEOUT); oxu_dbg(oxu, "port %d remote wakeup\n", i + 1); mod_timer(&hcd->rh_timer, oxu->reset_done[i]); } reverted: --- linux-3.13.0/drivers/usb/host/r8a66597-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/r8a66597-hcd.c @@ -2301,7 +2301,7 @@ rh->port &= ~USB_PORT_STAT_SUSPEND; rh->port |= USB_PORT_STAT_C_SUSPEND << 16; r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg); + msleep(50); - msleep(USB_RESUME_TIMEOUT); r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg); } reverted: --- linux-3.13.0/drivers/usb/host/sl811-hcd.c +++ linux-3.13.0.orig/drivers/usb/host/sl811-hcd.c @@ -1260,7 +1260,7 @@ sl811_write(sl811, SL11H_CTLREG1, sl811->ctrl1); mod_timer(&sl811->timer, jiffies + + msecs_to_jiffies(20)); - + msecs_to_jiffies(USB_RESUME_TIMEOUT)); break; case USB_PORT_FEAT_POWER: port_power(sl811, 0); reverted: --- linux-3.13.0/drivers/usb/host/uhci-hub.c +++ linux-3.13.0.orig/drivers/usb/host/uhci-hub.c @@ -165,7 +165,7 @@ /* Port received a wakeup request */ set_bit(port, &uhci->resuming_ports); uhci->ports_timeout = jiffies + + msecs_to_jiffies(25); - msecs_to_jiffies(USB_RESUME_TIMEOUT); usb_hcd_start_port_resume( &uhci_to_hcd(uhci)->self, port); @@ -337,8 +337,7 @@ uhci_finish_suspend(uhci, port, port_addr); /* USB v2.0 7.1.7.5 */ + uhci->ports_timeout = jiffies + msecs_to_jiffies(50); - uhci->ports_timeout = jiffies + - msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_POWER: /* UHCI has no power switching */ diff -u linux-3.13.0/drivers/usb/host/xhci-ring.c linux-3.13.0/drivers/usb/host/xhci-ring.c --- linux-3.13.0/drivers/usb/host/xhci-ring.c +++ linux-3.13.0/drivers/usb/host/xhci-ring.c @@ -1785,7 +1785,7 @@ } else { xhci_dbg(xhci, "resume HS port %d\n", port_id); bus_state->resume_done[faked_port_index] = jiffies + - msecs_to_jiffies(USB_RESUME_TIMEOUT); + msecs_to_jiffies(20); set_bit(faked_port_index, &bus_state->resuming_ports); mod_timer(&hcd->rh_timer, bus_state->resume_done[faked_port_index]); diff -u linux-3.13.0/drivers/usb/musb/musb_core.c linux-3.13.0/drivers/usb/musb/musb_core.c --- linux-3.13.0/drivers/usb/musb/musb_core.c +++ linux-3.13.0/drivers/usb/musb/musb_core.c @@ -100,7 +100,6 @@ #include #include #include -#include #include "musb_core.h" @@ -479,7 +478,7 @@ (USB_PORT_STAT_C_SUSPEND << 16) | MUSB_PORT_STAT_RESUME; musb->rh_timer = jiffies - + msecs_to_jiffies(USB_RESUME_TIMEOUT); + + msecs_to_jiffies(20); musb->xceiv->state = OTG_STATE_A_HOST; musb->is_active = 1; @@ -1515,30 +1514,16 @@ (devctl & MUSB_DEVCTL_HM) ? "host" : "peripheral", musb->int_usb, musb->int_tx, musb->int_rx); - /** - * According to Mentor Graphics' documentation, flowchart on page 98, - * IRQ should be handled as follows: - * - * . Resume IRQ - * . Session Request IRQ - * . VBUS Error IRQ - * . Suspend IRQ - * . Connect IRQ - * . Disconnect IRQ - * . Reset/Babble IRQ - * . SOF IRQ (we're not using this one) - * . Endpoint 0 IRQ - * . TX Endpoints - * . RX Endpoints - * - * We will be following that flowchart in order to avoid any problems - * that might arise with internal Finite State Machine. + /* the core can interrupt us for multiple reasons; docs have + * a generic interrupt flowchart to follow */ - if (musb->int_usb) retval |= musb_stage0_irq(musb, musb->int_usb, devctl); + /* "stage 1" is handling endpoint irqs */ + + /* handle endpoint 0 first */ if (musb->int_tx & 1) { if (devctl & MUSB_DEVCTL_HM) retval |= musb_h_ep0_irq(musb); @@ -1546,31 +1531,37 @@ retval |= musb_g_ep0_irq(musb); } - reg = musb->int_tx >> 1; + /* RX on endpoints 1-15 */ + reg = musb->int_rx >> 1; ep_num = 1; while (reg) { if (reg & 1) { + /* musb_ep_select(musb->mregs, ep_num); */ + /* REVISIT just retval = ep->rx_irq(...) */ retval = IRQ_HANDLED; if (devctl & MUSB_DEVCTL_HM) - musb_host_tx(musb, ep_num); + musb_host_rx(musb, ep_num); else - musb_g_tx(musb, ep_num); + musb_g_rx(musb, ep_num); } + reg >>= 1; ep_num++; } - reg = musb->int_rx >> 1; + /* TX on endpoints 1-15 */ + reg = musb->int_tx >> 1; ep_num = 1; while (reg) { if (reg & 1) { + /* musb_ep_select(musb->mregs, ep_num); */ + /* REVISIT just retval |= ep->tx_irq(...) */ retval = IRQ_HANDLED; if (devctl & MUSB_DEVCTL_HM) - musb_host_rx(musb, ep_num); + musb_host_tx(musb, ep_num); else - musb_g_rx(musb, ep_num); + musb_g_tx(musb, ep_num); } - reg >>= 1; ep_num++; } reverted: --- linux-3.13.0/drivers/usb/musb/musb_virthub.c +++ linux-3.13.0.orig/drivers/usb/musb/musb_virthub.c @@ -105,7 +105,7 @@ /* later, GetPortStatus will stop RESUME signaling */ musb->port1_status |= MUSB_PORT_STAT_RESUME; + musb->rh_timer = jiffies + msecs_to_jiffies(20); - musb->rh_timer = jiffies + msecs_to_jiffies(USB_RESUME_TIMEOUT); } } reverted: --- linux-3.13.0/drivers/usb/phy/phy.c +++ linux-3.13.0.orig/drivers/usb/phy/phy.c @@ -78,9 +78,7 @@ static int devm_usb_phy_match(struct device *dev, void *res, void *match_data) { + return res == match_data; - struct usb_phy **phy = res; - - return *phy == match_data; } /** reverted: --- linux-3.13.0/firmware/ihex2fw.c +++ linux-3.13.0.orig/firmware/ihex2fw.c @@ -86,7 +86,6 @@ case 'j': include_jump = 1; break; - default: return usage(); } } diff -u linux-3.13.0/fs/binfmt_elf.c linux-3.13.0/fs/binfmt_elf.c --- linux-3.13.0/fs/binfmt_elf.c +++ linux-3.13.0/fs/binfmt_elf.c @@ -754,7 +754,6 @@ i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; unsigned long k, vaddr; - unsigned long total_size = 0; if (elf_ppnt->p_type != PT_LOAD) continue; @@ -819,16 +818,10 @@ #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif - total_size = total_mapping_size(elf_phdata, - loc->elf_ex.e_phnum); - if (!total_size) { - error = -EINVAL; - goto out_free_dentry; - } } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, - elf_prot, elf_flags, total_size); + elf_prot, elf_flags, 0); if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); retval = IS_ERR((void *)error) ? diff -u linux-3.13.0/fs/btrfs/ctree.c linux-3.13.0/fs/btrfs/ctree.c --- linux-3.13.0/fs/btrfs/ctree.c +++ linux-3.13.0/fs/btrfs/ctree.c @@ -2925,7 +2925,7 @@ */ if (!p->leave_spinning) btrfs_set_path_blocking(p); - if (ret < 0 && !p->skip_release_on_error) + if (ret < 0) btrfs_release_path(p); return ret; } reverted: --- linux-3.13.0/fs/btrfs/ctree.h +++ linux-3.13.0.orig/fs/btrfs/ctree.h @@ -597,7 +597,6 @@ unsigned int skip_locking:1; unsigned int leave_spinning:1; unsigned int search_commit_root:1; - unsigned int skip_release_on_error:1; }; /* @@ -3547,10 +3546,6 @@ int verify_dir_item(struct btrfs_root *root, struct extent_buffer *leaf, struct btrfs_dir_item *dir_item); -struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root, - struct btrfs_path *path, - const char *name, - int name_len); /* orphan.c */ int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans, reverted: --- linux-3.13.0/fs/btrfs/dir-item.c +++ linux-3.13.0.orig/fs/btrfs/dir-item.c @@ -21,6 +21,10 @@ #include "hash.h" #include "transaction.h" +static struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root, + struct btrfs_path *path, + const char *name, int name_len); + /* * insert a name into a directory, doing overflow properly if there is a hash * collision. data_size indicates how big the item inserted should be. On @@ -379,9 +383,9 @@ * this walks through all the entries in a dir item and finds one * for a specific name. */ +static struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root, + struct btrfs_path *path, + const char *name, int name_len) -struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root, - struct btrfs_path *path, - const char *name, int name_len) { struct btrfs_dir_item *dir_item; unsigned long name_ptr; diff -u linux-3.13.0/fs/btrfs/extent-tree.c linux-3.13.0/fs/btrfs/extent-tree.c --- linux-3.13.0/fs/btrfs/extent-tree.c +++ linux-3.13.0/fs/btrfs/extent-tree.c @@ -6667,11 +6667,12 @@ return -ENOSPC; } + if (btrfs_test_opt(root, DISCARD)) + ret = btrfs_discard_extent(root, start, len, NULL); + if (pin) pin_down_extent(root, cache, start, len, 1); else { - if (btrfs_test_opt(root, DISCARD)) - ret = btrfs_discard_extent(root, start, len, NULL); btrfs_add_free_space(cache, start, len); btrfs_update_reserved_bytes(cache, len, RESERVE_FREE); } diff -u linux-3.13.0/fs/btrfs/ioctl.c linux-3.13.0/fs/btrfs/ioctl.c --- linux-3.13.0/fs/btrfs/ioctl.c +++ linux-3.13.0/fs/btrfs/ioctl.c @@ -2663,9 +2663,6 @@ if (src == dst) return -EINVAL; - if (len == 0) - return 0; - btrfs_double_lock(src, loff, dst, dst_loff, len); ret = extent_same_check_offsets(src, loff, len); @@ -3203,11 +3200,6 @@ if (off + len == src->i_size) len = ALIGN(src->i_size, bs) - off; - if (len == 0) { - ret = 0; - goto out_unlock; - } - /* verify the end result is block aligned */ if (!IS_ALIGNED(off, bs) || !IS_ALIGNED(off + len, bs) || !IS_ALIGNED(destoff, bs)) reverted: --- linux-3.13.0/fs/btrfs/xattr.c +++ linux-3.13.0.orig/fs/btrfs/xattr.c @@ -27,7 +27,6 @@ #include "transaction.h" #include "xattr.h" #include "disk-io.h" -#include "locking.h" ssize_t __btrfs_getxattr(struct inode *inode, const char *name, @@ -90,7 +89,7 @@ struct inode *inode, const char *name, const void *value, size_t size, int flags) { + struct btrfs_dir_item *di; - struct btrfs_dir_item *di = NULL; struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_path *path; size_t name_len = strlen(name); @@ -102,119 +101,84 @@ path = btrfs_alloc_path(); if (!path) return -ENOMEM; - path->skip_release_on_error = 1; - - if (!value) { - di = btrfs_lookup_xattr(trans, root, path, btrfs_ino(inode), - name, name_len, -1); - if (!di && (flags & XATTR_REPLACE)) - ret = -ENODATA; - else if (di) - ret = btrfs_delete_one_dir_name(trans, root, path, di); - goto out; - } - /* - * For a replace we can't just do the insert blindly. - * Do a lookup first (read-only btrfs_search_slot), and return if xattr - * doesn't exist. If it exists, fall down below to the insert/replace - * path - we can't race with a concurrent xattr delete, because the VFS - * locks the inode's i_mutex before calling setxattr or removexattr. - */ if (flags & XATTR_REPLACE) { + di = btrfs_lookup_xattr(trans, root, path, btrfs_ino(inode), name, + name_len, -1); + if (IS_ERR(di)) { + ret = PTR_ERR(di); + goto out; + } else if (!di) { - ASSERT(mutex_is_locked(&inode->i_mutex)); - di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(inode), - name, name_len, 0); - if (!di) { ret = -ENODATA; goto out; } + ret = btrfs_delete_one_dir_name(trans, root, path, di); + if (ret) + goto out; btrfs_release_path(path); - di = NULL; - } - ret = btrfs_insert_xattr_item(trans, root, path, btrfs_ino(inode), - name, name_len, value, size); - if (ret == -EOVERFLOW) { /* + * remove the attribute - * We have an existing item in a leaf, split_leaf couldn't - * expand it. That item might have or not a dir_item that - * matches our target xattr, so lets check. */ + if (!value) + goto out; + } else { + di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(inode), + name, name_len, 0); + if (IS_ERR(di)) { + ret = PTR_ERR(di); - ret = 0; - btrfs_assert_tree_locked(path->nodes[0]); - di = btrfs_match_dir_item_name(root, path, name, name_len); - if (!di && !(flags & XATTR_REPLACE)) { - ret = -ENOSPC; goto out; } + if (!di && !value) + goto out; + btrfs_release_path(path); - } else if (ret == -EEXIST) { - ret = 0; - di = btrfs_match_dir_item_name(root, path, name, name_len); - ASSERT(di); /* logic error */ - } else if (ret) { - goto out; } +again: + ret = btrfs_insert_xattr_item(trans, root, path, btrfs_ino(inode), + name, name_len, value, size); + /* + * If we're setting an xattr to a new value but the new value is say + * exactly BTRFS_MAX_XATTR_SIZE, we could end up with EOVERFLOW getting + * back from split_leaf. This is because it thinks we'll be extending + * the existing item size, but we're asking for enough space to add the + * item itself. So if we get EOVERFLOW just set ret to EEXIST and let + * the rest of the function figure it out. + */ + if (ret == -EOVERFLOW) - if (di && (flags & XATTR_CREATE)) { ret = -EEXIST; - goto out; - } + if (ret == -EEXIST) { + if (flags & XATTR_CREATE) + goto out; - if (di) { /* + * We can't use the path we already have since we won't have the + * proper locking for a delete, so release the path and + * re-lookup to delete the thing. - * We're doing a replace, and it must be atomic, that is, at - * any point in time we have either the old or the new xattr - * value in the tree. We don't want readers (getxattr and - * listxattrs) to miss a value, this is specially important - * for ACLs. */ + btrfs_release_path(path); + di = btrfs_lookup_xattr(trans, root, path, btrfs_ino(inode), + name, name_len, -1); + if (IS_ERR(di)) { + ret = PTR_ERR(di); + goto out; + } else if (!di) { + /* Shouldn't happen but just in case... */ + btrfs_release_path(path); + goto again; - const int slot = path->slots[0]; - struct extent_buffer *leaf = path->nodes[0]; - const u16 old_data_len = btrfs_dir_data_len(leaf, di); - const u32 item_size = btrfs_item_size_nr(leaf, slot); - const u32 data_size = sizeof(*di) + name_len + size; - struct btrfs_item *item; - unsigned long data_ptr; - char *ptr; - - if (size > old_data_len) { - if (btrfs_leaf_free_space(root, leaf) < - (size - old_data_len)) { - ret = -ENOSPC; - goto out; - } } + ret = btrfs_delete_one_dir_name(trans, root, path, di); + if (ret) + goto out; - if (old_data_len + name_len + sizeof(*di) == item_size) { - /* No other xattrs packed in the same leaf item. */ - if (size > old_data_len) - btrfs_extend_item(root, path, - size - old_data_len); - else if (size < old_data_len) - btrfs_truncate_item(root, path, data_size, 1); - } else { - /* There are other xattrs packed in the same item. */ - ret = btrfs_delete_one_dir_name(trans, root, path, di); - if (ret) - goto out; - btrfs_extend_item(root, path, data_size); - } - item = btrfs_item_nr(slot); - ptr = btrfs_item_ptr(leaf, slot, char); - ptr += btrfs_item_size(leaf, item) - data_size; - di = (struct btrfs_dir_item *)ptr; - btrfs_set_dir_data_len(leaf, di, size); - data_ptr = ((unsigned long)(di + 1)) + name_len; - write_extent_buffer(leaf, value, data_ptr, size); - btrfs_mark_buffer_dirty(leaf); - } else { /* + * We have a value to set, so go back and try to insert it now. - * Insert, and we had space for the xattr, so path->slots[0] is - * where our xattr dir_item is and btrfs_insert_xattr_item() - * filled it. */ + if (value) { + btrfs_release_path(path); + goto again; + } } out: btrfs_free_path(path); @@ -358,40 +322,21 @@ /* * Check if the attribute is in a supported namespace. * + * This applied after the check for the synthetic attributes in the system - * This is applied after the check for the synthetic attributes in the system * namespace. */ +static bool btrfs_is_valid_xattr(const char *name) -static int btrfs_is_valid_xattr(const char *name) { + return !strncmp(name, XATTR_SECURITY_PREFIX, + XATTR_SECURITY_PREFIX_LEN) || + !strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN) || + !strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) || + !strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN); - int len = strlen(name); - int prefixlen = 0; - - if (!strncmp(name, XATTR_SECURITY_PREFIX, - XATTR_SECURITY_PREFIX_LEN)) - prefixlen = XATTR_SECURITY_PREFIX_LEN; - else if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) - prefixlen = XATTR_SYSTEM_PREFIX_LEN; - else if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) - prefixlen = XATTR_TRUSTED_PREFIX_LEN; - else if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) - prefixlen = XATTR_USER_PREFIX_LEN; - else - return -EOPNOTSUPP; - - /* - * The name cannot consist of just prefix - */ - if (len <= prefixlen) - return -EINVAL; - - return 0; } ssize_t btrfs_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size) { - int ret; - /* * If this is a request for a synthetic attribute in the system.* * namespace use the generic infrastructure to resolve a handler @@ -400,9 +345,8 @@ if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) return generic_getxattr(dentry, name, buffer, size); + if (!btrfs_is_valid_xattr(name)) + return -EOPNOTSUPP; - ret = btrfs_is_valid_xattr(name); - if (ret) - return ret; return __btrfs_getxattr(dentry->d_inode, name, buffer, size); } @@ -410,7 +354,6 @@ size_t size, int flags) { struct btrfs_root *root = BTRFS_I(dentry->d_inode)->root; - int ret; /* * The permission on security.* and system.* is not checked @@ -427,9 +370,8 @@ if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) return generic_setxattr(dentry, name, value, size, flags); + if (!btrfs_is_valid_xattr(name)) + return -EOPNOTSUPP; - ret = btrfs_is_valid_xattr(name); - if (ret) - return ret; if (size == 0) value = ""; /* empty EA, do not remove */ @@ -441,7 +383,6 @@ int btrfs_removexattr(struct dentry *dentry, const char *name) { struct btrfs_root *root = BTRFS_I(dentry->d_inode)->root; - int ret; /* * The permission on security.* and system.* is not checked @@ -458,9 +399,8 @@ if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) return generic_removexattr(dentry, name); + if (!btrfs_is_valid_xattr(name)) + return -EOPNOTSUPP; - ret = btrfs_is_valid_xattr(name); - if (ret) - return ret; return __btrfs_setxattr(NULL, dentry->d_inode, name, NULL, 0, XATTR_REPLACE); diff -u linux-3.13.0/fs/ext4/extents_status.c linux-3.13.0/fs/ext4/extents_status.c --- linux-3.13.0/fs/ext4/extents_status.c +++ linux-3.13.0/fs/ext4/extents_status.c @@ -656,14 +656,6 @@ BUG_ON(end < lblk); - if ((status & EXTENT_STATUS_DELAYED) && - (status & EXTENT_STATUS_WRITTEN)) { - ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as " - " delayed and written which can potentially " - " cause data loss.\n", lblk, len); - WARN_ON(1); - } - newes.es_lblk = lblk; newes.es_len = len; ext4_es_store_pblock(&newes, pblk); diff -u linux-3.13.0/fs/ext4/inode.c linux-3.13.0/fs/ext4/inode.c --- linux-3.13.0/fs/ext4/inode.c +++ linux-3.13.0/fs/ext4/inode.c @@ -577,7 +577,6 @@ status = map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && - !(status & EXTENT_STATUS_WRITTEN) && ext4_find_delalloc_range(inode, map->m_lblk, map->m_lblk + map->m_len - 1)) status |= EXTENT_STATUS_DELAYED; @@ -687,7 +686,6 @@ status = map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) && - !(status & EXTENT_STATUS_WRITTEN) && ext4_find_delalloc_range(inode, map->m_lblk, map->m_lblk + map->m_len - 1)) status |= EXTENT_STATUS_DELAYED; diff -u linux-3.13.0/fs/ext4/namei.c linux-3.13.0/fs/ext4/namei.c --- linux-3.13.0/fs/ext4/namei.c +++ linux-3.13.0/fs/ext4/namei.c @@ -1878,7 +1878,7 @@ struct inode *inode) { struct inode *dir = dentry->d_parent->d_inode; - struct buffer_head *bh = NULL; + struct buffer_head *bh; struct ext4_dir_entry_2 *de; struct ext4_dir_entry_tail *t; struct super_block *sb; @@ -1902,14 +1902,14 @@ return retval; if (retval == 1) { retval = 0; - goto out; + return retval; } } if (is_dx(dir)) { retval = ext4_dx_add_entry(handle, dentry, inode); if (!retval || (retval != ERR_BAD_DX_DIR)) - goto out; + return retval; ext4_clear_inode_flag(dir, EXT4_INODE_INDEX); dx_fallback++; ext4_mark_inode_dirty(handle, dir); @@ -1921,15 +1921,14 @@ return PTR_ERR(bh); retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh); - if (retval != -ENOSPC) - goto out; + if (retval != -ENOSPC) { + brelse(bh); + return retval; + } if (blocks == 1 && !dx_fallback && - EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) { - retval = make_indexed_dir(handle, dentry, inode, bh); - bh = NULL; /* make_indexed_dir releases bh */ - goto out; - } + EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) + return make_indexed_dir(handle, dentry, inode, bh); brelse(bh); } bh = ext4_append(handle, dir, &block); @@ -1945,7 +1944,6 @@ } retval = add_dirent_to_buf(handle, dentry, inode, de, bh); -out: brelse(bh); if (retval == 0) ext4_set_inode_state(inode, EXT4_STATE_NEWENTRY); reverted: --- linux-3.13.0/fs/fhandle.c +++ linux-3.13.0.orig/fs/fhandle.c @@ -195,9 +195,8 @@ goto out_err; } /* copy the full handle */ + if (copy_from_user(handle, ufh, + sizeof(struct file_handle) + - *handle = f_handle; - if (copy_from_user(&handle->f_handle, - &ufh->f_handle, f_handle.handle_bytes)) { retval = -EFAULT; goto out_handle; diff -u linux-3.13.0/fs/namei.c linux-3.13.0/fs/namei.c --- linux-3.13.0/fs/namei.c +++ linux-3.13.0/fs/namei.c @@ -1538,8 +1538,7 @@ if (should_follow_link(path->dentry, follow)) { if (nd->flags & LOOKUP_RCU) { - if (unlikely(nd->path.mnt != path->mnt || - unlazy_walk(nd, path->dentry))) { + if (unlikely(unlazy_walk(nd, path->dentry))) { err = -ECHILD; goto out_err; } @@ -2994,8 +2993,7 @@ if (should_follow_link(path->dentry, !symlink_ok)) { if (nd->flags & LOOKUP_RCU) { - if (unlikely(nd->path.mnt != path->mnt || - unlazy_walk(nd, path->dentry))) { + if (unlikely(unlazy_walk(nd, path->dentry))) { error = -ECHILD; goto out; } diff -u linux-3.13.0/fs/namespace.c linux-3.13.0/fs/namespace.c --- linux-3.13.0/fs/namespace.c +++ linux-3.13.0/fs/namespace.c @@ -1241,15 +1241,14 @@ down_write(&namespace_sem); } -enum umount_tree_flags { - UMOUNT_SYNC = 1, - UMOUNT_PROPAGATE = 2, -}; /* * mount_lock must be held * namespace_sem must be held for write + * how = 0 => just this tree, don't propagate + * how = 1 => propagate; we know that nobody else has reference to any victims + * how = 2 => lazy umount */ -static void umount_tree(struct mount *mnt, enum umount_tree_flags how) +void umount_tree(struct mount *mnt, int how) { HLIST_HEAD(tmp_list); struct mount *p; @@ -1263,7 +1262,7 @@ hlist_for_each_entry(p, &tmp_list, mnt_hash) list_del_init(&p->mnt_child); - if (how & UMOUNT_PROPAGATE) + if (how) propagate_umount(&tmp_list); hlist_for_each_entry(p, &tmp_list, mnt_hash) { @@ -1271,7 +1270,7 @@ list_del_init(&p->mnt_list); __touch_mnt_namespace(p->mnt_ns); p->mnt_ns = NULL; - if (how & UMOUNT_SYNC) + if (how < 2) p->mnt.mnt_flags |= MNT_SYNC_UMOUNT; if (mnt_has_parent(p)) { put_mountpoint(p->mnt_mp); @@ -1375,14 +1374,14 @@ if (flags & MNT_DETACH) { if (!list_empty(&mnt->mnt_list)) - umount_tree(mnt, UMOUNT_PROPAGATE); + umount_tree(mnt, 2); retval = 0; } else { shrink_submounts(mnt); retval = -EBUSY; if (!propagate_mount_busy(mnt, 2)) { if (!list_empty(&mnt->mnt_list)) - umount_tree(mnt, UMOUNT_PROPAGATE|UMOUNT_SYNC); + umount_tree(mnt, 1); retval = 0; } } @@ -1542,7 +1541,7 @@ out: if (res) { lock_mount_hash(); - umount_tree(res, UMOUNT_SYNC); + umount_tree(res, 0); unlock_mount_hash(); } return q; @@ -1566,7 +1565,7 @@ { namespace_lock(); lock_mount_hash(); - umount_tree(real_mount(mnt), UMOUNT_SYNC); + umount_tree(real_mount(mnt), 0); unlock_mount_hash(); namespace_unlock(); } @@ -1750,7 +1749,7 @@ out_cleanup_ids: while (!hlist_empty(&tree_list)) { child = hlist_entry(tree_list.first, struct mount, mnt_hash); - umount_tree(child, UMOUNT_SYNC); + umount_tree(child, 0); } unlock_mount_hash(); cleanup_group_ids(source_mnt, NULL); @@ -1925,7 +1924,7 @@ err = graft_tree(mnt, parent, mp); if (err) { lock_mount_hash(); - umount_tree(mnt, UMOUNT_SYNC); + umount_tree(mnt, 0); unlock_mount_hash(); } out2: @@ -2296,7 +2295,7 @@ while (!list_empty(&graveyard)) { mnt = list_first_entry(&graveyard, struct mount, mnt_expire); touch_mnt_namespace(mnt->mnt_ns); - umount_tree(mnt, UMOUNT_PROPAGATE|UMOUNT_SYNC); + umount_tree(mnt, 1); } unlock_mount_hash(); namespace_unlock(); @@ -2367,7 +2366,7 @@ m = list_first_entry(&graveyard, struct mount, mnt_expire); touch_mnt_namespace(m->mnt_ns); - umount_tree(m, UMOUNT_PROPAGATE|UMOUNT_SYNC); + umount_tree(m, 1); } } } reverted: --- linux-3.13.0/fs/nfs/callback.c +++ linux-3.13.0.orig/fs/nfs/callback.c @@ -135,7 +135,6 @@ struct rpc_rqst, rq_bc_list); list_del(&req->rq_bc_list); spin_unlock_bh(&serv->sv_cb_lock); - finish_wait(&serv->sv_cb_waitq, &wq); dprintk("Invoking bc_svc_process()\n"); error = bc_svc_process(serv, req, rqstp); dprintk("bc_svc_process() returned w/ error code= %d\n", @@ -143,9 +142,8 @@ } else { spin_unlock_bh(&serv->sv_cb_lock); schedule(); - finish_wait(&serv->sv_cb_waitq, &wq); } + finish_wait(&serv->sv_cb_waitq, &wq); - flush_signals(current); } return 0; } diff -u linux-3.13.0/fs/open.c linux-3.13.0/fs/open.c --- linux-3.13.0/fs/open.c +++ linux-3.13.0/fs/open.c @@ -543,7 +543,6 @@ uid = make_kuid(current_user_ns(), user); gid = make_kgid(current_user_ns(), group); -retry_deleg: newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { if (!uid_valid(uid)) @@ -560,6 +559,7 @@ if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; +retry_deleg: mutex_lock(&inode->i_mutex); error = security_path_chown(path, uid, gid); if (!error) diff -u linux-3.13.0/fs/overlayfs/readdir.c linux-3.13.0/fs/overlayfs/readdir.c --- linux-3.13.0/fs/overlayfs/readdir.c +++ linux-3.13.0/fs/overlayfs/readdir.c @@ -324,13 +324,16 @@ ovl_path_lower(file->f_path.dentry, &lowerpath); ovl_path_upper(file->f_path.dentry, &upperpath); - res = ovl_dentry_root_may(file->f_path.dentry, &upperpath, MAY_READ); - if (res) - return res; - res = ovl_dentry_root_may(file->f_path.dentry, &lowerpath, MAY_READ); - if (res) - return res; - + if (upperpath.dentry) { + res = ovl_dentry_root_may(file->f_path.dentry, &upperpath, MAY_READ); + if (res) + return res; + } + if (lowerpath.dentry) { + res = ovl_dentry_root_may(file->f_path.dentry, &lowerpath, MAY_READ); + if (res) + return res; + } res = ovl_dir_read_merged(&upperpath, &lowerpath, &od->cache); if (res) { ovl_cache_free(&od->cache); @@ -475,13 +478,16 @@ ovl_path_upper(dentry, &upperpath); ovl_path_lower(dentry, &lowerpath); - err = ovl_dentry_root_may(dentry, &upperpath, MAY_READ); - if (err) - return err; - err = ovl_dentry_root_may(dentry, &lowerpath, MAY_READ); - if (err) - return err; - + if (upperpath.dentry) { + err = ovl_dentry_root_may(dentry, &upperpath, MAY_READ); + if (err) + return err; + } + if (lowerpath.dentry) { + err = ovl_dentry_root_may(dentry, &lowerpath, MAY_READ); + if (err) + return err; + } err = ovl_dir_read_merged(&upperpath, &lowerpath, list); if (err) return err; diff -u linux-3.13.0/fs/pnode.h linux-3.13.0/fs/pnode.h --- linux-3.13.0/fs/pnode.h +++ linux-3.13.0/fs/pnode.h @@ -47,6 +47,7 @@ unsigned int mnt_get_count(struct mount *mnt); void mnt_set_mountpoint(struct mount *, struct mountpoint *, struct mount *); +void umount_tree(struct mount *, int); struct mount *copy_tree(struct mount *, struct dentry *, int); bool is_path_reachable(struct mount *, struct dentry *, const struct path *root); diff -u linux-3.13.0/fs/udf/inode.c linux-3.13.0/fs/udf/inode.c --- linux-3.13.0/fs/udf/inode.c +++ linux-3.13.0/fs/udf/inode.c @@ -1286,7 +1286,6 @@ struct udf_sb_info *sbi = UDF_SB(inode->i_sb); unsigned int link_count; unsigned int indirections = 0; - int bs = inode->i_sb->s_blocksize; reread: /* @@ -1372,38 +1371,41 @@ if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_EFE)) { iinfo->i_efe = 1; iinfo->i_use = 0; - if (udf_alloc_i_data(inode, bs - + if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize - sizeof(struct extendedFileEntry))) { make_bad_inode(inode); return; } memcpy(iinfo->i_ext.i_data, bh->b_data + sizeof(struct extendedFileEntry), - bs - sizeof(struct extendedFileEntry)); + inode->i_sb->s_blocksize - + sizeof(struct extendedFileEntry)); } else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_FE)) { iinfo->i_efe = 0; iinfo->i_use = 0; - if (udf_alloc_i_data(inode, bs - sizeof(struct fileEntry))) { + if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize - + sizeof(struct fileEntry))) { make_bad_inode(inode); return; } memcpy(iinfo->i_ext.i_data, bh->b_data + sizeof(struct fileEntry), - bs - sizeof(struct fileEntry)); + inode->i_sb->s_blocksize - sizeof(struct fileEntry)); } else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_USE)) { iinfo->i_efe = 0; iinfo->i_use = 1; iinfo->i_lenAlloc = le32_to_cpu( ((struct unallocSpaceEntry *)bh->b_data)-> lengthAllocDescs); - if (udf_alloc_i_data(inode, bs - + if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize - sizeof(struct unallocSpaceEntry))) { make_bad_inode(inode); return; } memcpy(iinfo->i_ext.i_data, bh->b_data + sizeof(struct unallocSpaceEntry), - bs - sizeof(struct unallocSpaceEntry)); + inode->i_sb->s_blocksize - + sizeof(struct unallocSpaceEntry)); return; } @@ -1480,19 +1482,6 @@ iinfo->i_checkpoint = le32_to_cpu(efe->checkpoint); } - /* - * Sanity check length of allocation descriptors and extended attrs to - * avoid integer overflows - */ - if (iinfo->i_lenEAttr > bs || iinfo->i_lenAlloc > bs) { - make_bad_inode(inode); - return; - } - /* Now do exact checks */ - if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > bs) { - make_bad_inode(inode); - return; - } /* Sanity checks for files in ICB so that we don't get confused later */ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { /* @@ -1504,7 +1493,8 @@ return; } /* File in ICB has to fit in there... */ - if (inode->i_size > bs - udf_file_entry_alloc_offset(inode)) { + if (inode->i_size > inode->i_sb->s_blocksize - + udf_file_entry_alloc_offset(inode)) { make_bad_inode(inode); return; } reverted: --- linux-3.13.0/fs/xfs/xfs_mount.c +++ linux-3.13.0.orig/fs/xfs/xfs_mount.c @@ -314,6 +314,7 @@ * Initialize the mount structure from the superblock. */ xfs_sb_from_disk(&mp->m_sb, XFS_BUF_TO_SBP(bp)); + xfs_sb_quota_from_disk(&mp->m_sb); /* * We must be able to do sector-sized and sector-aligned IO. reverted: --- linux-3.13.0/fs/xfs/xfs_sb.c +++ linux-3.13.0.orig/fs/xfs/xfs_sb.c @@ -398,13 +398,10 @@ } } +void +xfs_sb_from_disk( - - -static void -__xfs_sb_from_disk( struct xfs_sb *to, + xfs_dsb_t *from) - xfs_dsb_t *from, - bool convert_xquota) { to->sb_magicnum = be32_to_cpu(from->sb_magicnum); to->sb_blocksize = be32_to_cpu(from->sb_blocksize); @@ -460,17 +457,6 @@ to->sb_pad = 0; to->sb_pquotino = be64_to_cpu(from->sb_pquotino); to->sb_lsn = be64_to_cpu(from->sb_lsn); - /* Convert on-disk flags to in-memory flags? */ - if (convert_xquota) - xfs_sb_quota_from_disk(to); -} - -void -xfs_sb_from_disk( - struct xfs_sb *to, - xfs_dsb_t *from) -{ - __xfs_sb_from_disk(to, from, true); } static inline void @@ -586,11 +572,7 @@ struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_sb sb; + xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp)); - /* - * Use call variant which doesn't convert quota flags from disk - * format, because xfs_mount_validate_sb checks the on-disk flags. - */ - __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); /* * Only check the in progress field for the primary superblock as reverted: --- linux-3.13.0/include/acpi/actypes.h +++ linux-3.13.0.orig/include/acpi/actypes.h @@ -198,29 +198,9 @@ typedef s32 acpi_native_int; typedef u32 acpi_size; - -#ifdef ACPI_32BIT_PHYSICAL_ADDRESS - -/* - * OSPMs can define this to shrink the size of the structures for 32-bit - * none PAE environment. ASL compiler may always define this to generate - * 32-bit OSPM compliant tables. - */ typedef u32 acpi_io_address; typedef u32 acpi_physical_address; -#else /* ACPI_32BIT_PHYSICAL_ADDRESS */ - -/* - * It is reported that, after some calculations, the physical addresses can - * wrap over the 32-bit boundary on 32-bit PAE environment. - * https://bugzilla.kernel.org/show_bug.cgi?id=87971 - */ -typedef u64 acpi_io_address; -typedef u64 acpi_physical_address; - -#endif /* ACPI_32BIT_PHYSICAL_ADDRESS */ - #define ACPI_MAX_PTR ACPI_UINT32_MAX #define ACPI_SIZE_MAX ACPI_UINT32_MAX reverted: --- linux-3.13.0/include/acpi/platform/acenv.h +++ linux-3.13.0.orig/include/acpi/platform/acenv.h @@ -76,7 +76,6 @@ #define ACPI_LARGE_NAMESPACE_NODE #define ACPI_DATA_TABLE_DISASSEMBLY #define ACPI_SINGLE_THREADED -#define ACPI_32BIT_PHYSICAL_ADDRESS #endif /* acpi_exec configuration. Multithreaded with full AML debugger */ reverted: --- linux-3.13.0/include/linux/jhash.h +++ linux-3.13.0.orig/include/linux/jhash.h @@ -145,11 +145,11 @@ } +/* jhash_3words - hash exactly 3, 2 or 1 word(s) */ +static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval) -/* __jhash_nwords - hash exactly 3, 2 or 1 word(s) */ -static inline u32 __jhash_nwords(u32 a, u32 b, u32 c, u32 initval) { + a += JHASH_INITVAL; + b += JHASH_INITVAL; - a += initval; - b += initval; c += initval; __jhash_final(a, b, c); @@ -157,19 +157,14 @@ return c; } -static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval) -{ - return __jhash_nwords(a, b, c, initval + JHASH_INITVAL + (3 << 2)); -} - static inline u32 jhash_2words(u32 a, u32 b, u32 initval) { + return jhash_3words(a, b, 0, initval); - return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2)); } static inline u32 jhash_1word(u32 a, u32 initval) { + return jhash_3words(a, 0, 0, initval); - return __jhash_nwords(a, 0, 0, initval + JHASH_INITVAL + (1 << 2)); } #endif /* _LINUX_JHASH_H */ diff -u linux-3.13.0/include/linux/phy.h linux-3.13.0/include/linux/phy.h --- linux-3.13.0/include/linux/phy.h +++ linux-3.13.0/include/linux/phy.h @@ -67,50 +67,8 @@ PHY_INTERFACE_MODE_RTBI, PHY_INTERFACE_MODE_SMII, PHY_INTERFACE_MODE_XGMII, - PHY_INTERFACE_MODE_MAX, } phy_interface_t; -/** - * It maps 'enum phy_interface_t' found in include/linux/phy.h - * into the device tree binding of 'phy-mode', so that Ethernet - * device driver can get phy interface from device tree. - */ -static inline const char *phy_modes(phy_interface_t interface) -{ - switch (interface) { - case PHY_INTERFACE_MODE_NA: - return ""; - case PHY_INTERFACE_MODE_MII: - return "mii"; - case PHY_INTERFACE_MODE_GMII: - return "gmii"; - case PHY_INTERFACE_MODE_SGMII: - return "sgmii"; - case PHY_INTERFACE_MODE_TBI: - return "tbi"; - case PHY_INTERFACE_MODE_REVMII: - return "rev-mii"; - case PHY_INTERFACE_MODE_RMII: - return "rmii"; - case PHY_INTERFACE_MODE_RGMII: - return "rgmii"; - case PHY_INTERFACE_MODE_RGMII_ID: - return "rgmii-id"; - case PHY_INTERFACE_MODE_RGMII_RXID: - return "rgmii-rxid"; - case PHY_INTERFACE_MODE_RGMII_TXID: - return "rgmii-txid"; - case PHY_INTERFACE_MODE_RTBI: - return "rtbi"; - case PHY_INTERFACE_MODE_SMII: - return "smii"; - case PHY_INTERFACE_MODE_XGMII: - return "xgmii"; - default: - return "unknown"; - } -} - #define PHY_INIT_TIMEOUT 100000 #define PHY_STATE_TIME 1 diff -u linux-3.13.0/include/linux/usb.h linux-3.13.0/include/linux/usb.h --- linux-3.13.0/include/linux/usb.h +++ linux-3.13.0/include/linux/usb.h @@ -206,32 +206,6 @@ #define USB_MAXINTERFACES 32 #define USB_MAXIADS (USB_MAXINTERFACES/2) -/* - * USB Resume Timer: Every Host controller driver should drive the resume - * signalling on the bus for the amount of time defined by this macro. - * - * That way we will have a 'stable' behavior among all HCDs supported by Linux. - * - * Note that the USB Specification states we should drive resume for *at least* - * 20 ms, but it doesn't give an upper bound. This creates two possible - * situations which we want to avoid: - * - * (a) sometimes an msleep(20) might expire slightly before 20 ms, which causes - * us to fail USB Electrical Tests, thus failing Certification - * - * (b) Some (many) devices actually need more than 20 ms of resume signalling, - * and while we can argue that's against the USB Specification, we don't have - * control over which devices a certification laboratory will be using for - * certification. If CertLab uses a device which was tested against Windows and - * that happens to have relaxed resume signalling rules, we might fall into - * situations where we fail interoperability and electrical tests. - * - * In order to avoid both conditions, we're using a 40 ms resume timeout, which - * should cope with both LPJ calibration errors and devices not following every - * detail of the USB Specification. - */ -#define USB_RESUME_TIMEOUT 40 /* ms */ - /** * struct usb_interface_cache - long-term representation of a device interface * @num_altsetting: number of altsettings defined. diff -u linux-3.13.0/include/target/target_core_base.h linux-3.13.0/include/target/target_core_base.h --- linux-3.13.0/include/target/target_core_base.h +++ linux-3.13.0/include/target/target_core_base.h @@ -458,7 +458,7 @@ sense_reason_t (*execute_cmd)(struct se_cmd *); sense_reason_t (*execute_rw)(struct se_cmd *, struct scatterlist *, u32, enum dma_data_direction); - sense_reason_t (*transport_complete_callback)(struct se_cmd *, bool); + sense_reason_t (*transport_complete_callback)(struct se_cmd *); unsigned char *t_task_cdb; unsigned char __t_task_cdb[TCM_MAX_COMMAND_SIZE]; reverted: --- linux-3.13.0/kernel/ptrace.c +++ linux-3.13.0.orig/kernel/ptrace.c @@ -720,8 +720,6 @@ static int ptrace_resume(struct task_struct *child, long request, unsigned long data) { - bool need_siglock; - if (!valid_signal(data)) return -EIO; @@ -749,26 +747,8 @@ user_disable_single_step(child); } - /* - * Change ->exit_code and ->state under siglock to avoid the race - * with wait_task_stopped() in between; a non-zero ->exit_code will - * wrongly look like another report from tracee. - * - * Note that we need siglock even if ->exit_code == data and/or this - * status was not reported yet, the new status must not be cleared by - * wait_task_stopped() after resume. - * - * If data == 0 we do not care if wait_task_stopped() reports the old - * status and clears the code too; this can't race with the tracee, it - * takes siglock after resume. - */ - need_siglock = data && !thread_group_empty(current); - if (need_siglock) - spin_lock_irq(&child->sighand->siglock); child->exit_code = data; wake_up_state(child, __TASK_TRACED); - if (need_siglock) - spin_unlock_irq(&child->sighand->siglock); return 0; } diff -u linux-3.13.0/kernel/trace/ring_buffer.c linux-3.13.0/kernel/trace/ring_buffer.c --- linux-3.13.0/kernel/trace/ring_buffer.c +++ linux-3.13.0/kernel/trace/ring_buffer.c @@ -2648,7 +2648,7 @@ static __always_inline int trace_recursive_lock(void) { - unsigned int val = __this_cpu_read(current_context); + unsigned int val = this_cpu_read(current_context); int bit; if (in_interrupt()) { @@ -2665,17 +2665,18 @@ return 1; val |= (1 << bit); - __this_cpu_write(current_context, val); + this_cpu_write(current_context, val); return 0; } static __always_inline void trace_recursive_unlock(void) { - unsigned int val = __this_cpu_read(current_context); + unsigned int val = this_cpu_read(current_context); - val &= val & (val - 1); - __this_cpu_write(current_context, val); + val--; + val &= this_cpu_read(current_context); + this_cpu_write(current_context, val); } #else diff -u linux-3.13.0/lib/string.c linux-3.13.0/lib/string.c --- linux-3.13.0/lib/string.c +++ linux-3.13.0/lib/string.c @@ -616,7 +616,7 @@ void memzero_explicit(void *s, size_t count) { memset(s, 0, count); - barrier(); + OPTIMIZER_HIDE_VAR(s); } EXPORT_SYMBOL(memzero_explicit); diff -u linux-3.13.0/mm/hugetlb.c linux-3.13.0/mm/hugetlb.c --- linux-3.13.0/mm/hugetlb.c +++ linux-3.13.0/mm/hugetlb.c @@ -3500,7 +3500,8 @@ if (!pmd_huge(*pmd)) goto out; if (pmd_present(*pmd)) { - page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT); + page = pte_page(*(pte_t *)pmd) + + ((address & ~PMD_MASK) >> PAGE_SHIFT); if (flags & FOLL_GET) get_page(page); } else { diff -u linux-3.13.0/net/core/skbuff.c linux-3.13.0/net/core/skbuff.c --- linux-3.13.0/net/core/skbuff.c +++ linux-3.13.0/net/core/skbuff.c @@ -3578,21 +3578,18 @@ */ void skb_scrub_packet(struct sk_buff *skb, bool xnet) { + if (xnet) + skb_orphan(skb); skb->tstamp.tv64 = 0; skb->pkt_type = PACKET_HOST; skb->skb_iif = 0; skb->local_df = 0; skb_dst_drop(skb); + skb->mark = 0; skb_init_secmark(skb); secpath_reset(skb); nf_reset(skb); nf_reset_trace(skb); - - if (!xnet) - return; - - skb_orphan(skb); - skb->mark = 0; } EXPORT_SYMBOL_GPL(skb_scrub_packet); reverted: --- linux-3.13.0/scripts/mod/modpost.c +++ linux-3.13.0.orig/scripts/mod/modpost.c @@ -584,16 +584,12 @@ if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 || strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 || strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 || + strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0) - strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0 || - strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 || - strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0) return 1; if (info->hdr->e_machine == EM_PPC64) /* Special register function linked on all modules during final link of .ko */ if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 || + strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0) - strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0 || - strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 || - strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0) return 1; /* Do not ignore this symbol */ return 0; reverted: --- linux-3.13.0/sound/pci/emu10k1/emuproc.c +++ linux-3.13.0.orig/sound/pci/emu10k1/emuproc.c @@ -241,22 +241,31 @@ struct snd_emu10k1 *emu = entry->private_data; u32 value; u32 value2; + unsigned long flags; u32 rate; if (emu->card_capabilities->emu_model) { + spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x38, &value); + spin_unlock_irqrestore(&emu->emu_lock, flags); if ((value & 0x1) == 0) { + spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x2a, &value); snd_emu1010_fpga_read(emu, 0x2b, &value2); + spin_unlock_irqrestore(&emu->emu_lock, flags); rate = 0x1770000 / (((value << 5) | value2)+1); snd_iprintf(buffer, "ADAT Locked : %u\n", rate); } else { snd_iprintf(buffer, "ADAT Unlocked\n"); } + spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x20, &value); + spin_unlock_irqrestore(&emu->emu_lock, flags); if ((value & 0x4) == 0) { + spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x28, &value); snd_emu1010_fpga_read(emu, 0x29, &value2); + spin_unlock_irqrestore(&emu->emu_lock, flags); rate = 0x1770000 / (((value << 5) | value2)+1); snd_iprintf(buffer, "SPDIF Locked : %d\n", rate); } else { @@ -401,11 +410,14 @@ { struct snd_emu10k1 *emu = entry->private_data; u32 value; + unsigned long flags; int i; snd_iprintf(buffer, "EMU1010 Registers:\n\n"); for(i = 0; i < 0x40; i+=1) { + spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, i, &value); + spin_unlock_irqrestore(&emu->emu_lock, flags); snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f); } } diff -u linux-3.13.0/sound/soc/codecs/cs4271.c linux-3.13.0/sound/soc/codecs/cs4271.c --- linux-3.13.0/sound/soc/codecs/cs4271.c +++ linux-3.13.0/sound/soc/codecs/cs4271.c @@ -572,10 +572,10 @@ if (gpio_nreset >= 0) { /* Reset codec */ gpio_direction_output(gpio_nreset, 0); - mdelay(1); + udelay(1); gpio_set_value(gpio_nreset, 1); /* Give the codec time to wake up */ - mdelay(1); + udelay(1); } cs4271->gpio_nreset = gpio_nreset; reverted: --- linux-3.13.0/sound/soc/codecs/wm8741.c +++ linux-3.13.0.orig/sound/soc/codecs/wm8741.c @@ -123,7 +123,7 @@ }; static unsigned int rates_11289[] = { + 44100, 88235, - 44100, 88200, }; static struct snd_pcm_hw_constraint_list constraints_11289 = { @@ -150,7 +150,7 @@ }; static unsigned int rates_16934[] = { + 44100, 88235, - 44100, 88200, }; static struct snd_pcm_hw_constraint_list constraints_16934 = { @@ -168,7 +168,7 @@ }; static unsigned int rates_22579[] = { + 44100, 88235, 1764000 - 44100, 88200, 176400 }; static struct snd_pcm_hw_constraint_list constraints_22579 = { @@ -186,7 +186,7 @@ }; static unsigned int rates_36864[] = { + 48000, 96000, 19200 - 48000, 96000, 192000 }; static struct snd_pcm_hw_constraint_list constraints_36864 = { reverted: --- linux-3.13.0/sound/soc/davinci/davinci-evm.c +++ linux-3.13.0.orig/sound/soc/davinci/davinci-evm.c @@ -396,8 +396,18 @@ return ret; } +static int davinci_evm_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); + + return 0; +} + static struct platform_driver davinci_evm_driver = { .probe = davinci_evm_probe, + .remove = davinci_evm_remove, .driver = { .name = "davinci_evm", .owner = THIS_MODULE, reverted: --- linux-3.13.0/tools/lib/traceevent/kbuffer-parse.c +++ linux-3.13.0.orig/tools/lib/traceevent/kbuffer-parse.c @@ -372,6 +372,7 @@ switch (type_len) { case KBUFFER_TYPE_PADDING: *length = read_4(kbuf, data); + data += *length; break; case KBUFFER_TYPE_TIME_EXTEND: diff -u linux-3.13.0/tools/power/x86/turbostat/Makefile linux-3.13.0/tools/power/x86/turbostat/Makefile --- linux-3.13.0/tools/power/x86/turbostat/Makefile +++ linux-3.13.0/tools/power/x86/turbostat/Makefile @@ -1,12 +1,8 @@ CC = $(CROSS_COMPILE)gcc -BUILD_OUTPUT := $(CURDIR) +BUILD_OUTPUT := $(PWD) PREFIX := /usr DESTDIR := -ifeq ("$(origin O)", "command line") - BUILD_OUTPUT := $(O) -endif - turbostat : turbostat.c CFLAGS += -Wall CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"' diff -u linux-3.13.0/virt/kvm/kvm_main.c linux-3.13.0/virt/kvm/kvm_main.c --- linux-3.13.0/virt/kvm/kvm_main.c +++ linux-3.13.0/virt/kvm/kvm_main.c @@ -1559,8 +1559,8 @@ ghc->generation = slots->generation; ghc->len = len; ghc->memslot = gfn_to_memslot(kvm, start_gfn); - ghc->hva = gfn_to_hva_many(ghc->memslot, start_gfn, NULL); - if (!kvm_is_error_hva(ghc->hva) && nr_pages_needed <= 1) { + ghc->hva = gfn_to_hva_many(ghc->memslot, start_gfn, &nr_pages_avail); + if (!kvm_is_error_hva(ghc->hva) && nr_pages_avail >= nr_pages_needed) { ghc->hva += offset; } else { /*