1. 30 3月, 2012 2 次提交
  2. 28 3月, 2012 1 次提交
    • P
      ARM: pxa: fix regulator related build fail in magician_defconfig · 3a569132
      Paul Gortmaker 提交于
      commit 737f360d (linux-next)
      
        "regulator: Remove support for supplies specified by struct device"
      
      deletes the field from the struct, but this platform was still trying
      to set those fields.  Delete the assignments.
      
      arch/arm/mach-pxa/magician.c:581: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type
      arch/arm/mach-pxa/magician.c:585: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type
      
      arch/arm/mach-pxa/hx4700.c:683: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type
      arch/arm/mach-pxa/hx4700.c:687: error: unknown field 'dev' specified in initializer
      arch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@gmail.com>
      3a569132
  3. 19 3月, 2012 2 次提交
  4. 18 3月, 2012 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c579bc7e
      Linus Torvalds 提交于
      Pull networking changes from David Miller:
       "1) icmp6_dst_alloc() returns NULL instead of ERR_PTR() leading to
           crashes, particularly during shutdown.  Reported by Dave Jones and
           fixed by Eric Dumazet.
      
        2) hyperv and wimax/i2400m return NETDEV_TX_BUSY when they have
           already freed the SKB, which causes crashes as to the caller this
           means requeue the packet.  Fixes from Eric Dumazet.
      
        3) usbnet driver doesn't allocate the right amount of headroom on
           fresh RX SKBs, fix from Eric Dumazet.
      
        4) Fix regression in ip6_mc_find_dev_rcu(), as an RCU lookup it
           abolutely should not take a reference to 'dev', this leads to
           leaks.  Fix from RonQing Li.
      
        5) Fix netfilter ctnetlink race between delete and timeout expiration.
           From Pablo Neira Ayuso.
      
        6) Revert SFQ change which causes regressions, specifically queueing
           to tail can lead to unavoidable flow starvation.  From Eric
           Dumazet.
      
        7) Fix a memory leak and a crash on corrupt firmware files in bnx2x,
           from Michal Schmidt."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netfilter: ctnetlink: fix race between delete and timeout expiration
        ipv6: Don't dev_hold(dev) in ip6_mc_find_dev_rcu.
        wimax/i2400m: fix erroneous NETDEV_TX_BUSY use
        net/hyperv: fix erroneous NETDEV_TX_BUSY use
        net/usbnet: reserve headroom on rx skbs
        bnx2x: fix memory leak in bnx2x_init_firmware()
        bnx2x: fix a crash on corrupt firmware file
        sch_sfq: revert dont put new flow at the end of flows
        ipv6: fix icmp6_dst_alloc()
      c579bc7e
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 96ee0499
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools, x86: Build perf on older user-space as well
        perf tools: Use scnprintf where applicable
        perf tools: Incorrect use of snprintf results in SEGV
      96ee0499
  5. 17 3月, 2012 9 次提交
  6. 16 3月, 2012 24 次提交