1. 17 Jun, 2013 36 commits
  2. 15 Jun, 2013 4 commits
    • Linus Torvalds's avatar
      Linux 3.10-rc6 · 7d132055
      Linus Torvalds authored
      7d132055
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e6694d98
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "These are a little later than I planned on since I got caught up with
        handling merges for 3.11 most of the week.
      
        Another week, another batch of fixes for arm-soc platforms.
      
        Again, nothing controversial.  A few more than would be ideal, but all
        are valid fixes.  In particular the prima2 panic patch is critical
        since it fixes a problem where multiplatform kernels panic on all but
        prima2 hardware."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms
        ARM: prima2: fix incorrect panic usage
        arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
        ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
        ARM: omap3: clock: fix wrong container_of in clock36xx.c
        ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
        ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
        ARM: dts: AM33xx: Fix properties on gpmc node
        arm: omap2: fix AM33xx hwmod infos for UART2
        ARM: OMAP3: Fix iva2_pwrdm settings for 3703
      e6694d98
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 596fa9e6
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix RTNL locking in batman-adv, from Matthias Schiffer.
      
       2) Don't allow non-passthrough macvlan devices to set NOPROMISC via
          netlink, otherwise we can end up with corrupted promisc counter
          values on the device.  From Michael S Tsirkin.
      
       3) Fix stmmac driver build with debugging defines enabled, from Dinh
          Nguyen.
      
       4) Make sure name string we give in socket address in AF_PACKET is NULL
          terminated, from Daniel Borkmann.
      
       5) Fix leaking of two uninitialized bytes of memory to userspace in
          l2tp, from Guillaume Nault.
      
       6) Clear IPCB(skb) before tunneling otherwise we touch dangling IP
          options state and crash.  From Saurabh Mohan.
      
       7) Fix suspend/resume for davinci_mdio by using suspend_late and
          resume_early.  From Mugunthan V N.
      
       8) Don't tag ip_tunnel_init_net and ip_tunnel_delete_net with
          __net_{init,exit}, they can be called outside of those contexts.
          From Eric Dumazet.
      
       9) Fix RX length error in sh_eth driver, from Yoshihiro Shimoda.
      
      10) Fix missing sctp_outq initialization in some code paths of SCTP
          stack, from Neil Horman.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
        sctp: fully initialize sctp_outq in sctp_outq_init
        netiucv: Hold rtnl between name allocation and device registration.
        tulip: Properly check dma mapping result
        net: sh_eth: fix incorrect RX length error if R8A7740
        ip_tunnel: remove __net_init/exit from exported functions
        drivers: net: davinci_mdio: restore mdio clk divider in mdio resume
        drivers: net: davinci_mdio: moving mdio resume earlier than cpsw ethernet driver
        net/ipv4: ip_vti clear skb cb before tunneling.
        tg3: Wait for boot code to finish after power on
        l2tp: Fix sendmsg() return value
        l2tp: Fix PPP header erasure and memory leak
        bonding: fix igmp_retrans type and two related races
        bonding: reset master mac on first enslave failure
        packet: packet_getname_spkt: make sure string is always 0-terminated
        net: ethernet: stmicro: stmmac: Fix compile error when STMMAC_XMIT_DEBUG used
        be2net: Fix 32-bit DMA Mask handling
        xen-netback: don't de-reference vif pointer after having called xenvif_put()
        macvlan: don't touch promisc without passthrough
        batman-adv: Don't handle address updates when bla is disabled
        batman-adv: forward late OGMs from best next hop
        ...
      596fa9e6
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5938930e
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "So here are 3 fixes still for 3.10.  Fixes are simple, bugs are nasty
        (though not recent regressions, nasty enough) and all targeted at
        stable"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Fix missing/delayed calls to irq_work
        powerpc: Fix emulation of illegal instructions on PowerNV platform
        powerpc: Fix stack overflow crash in resume_kernel when ftracing
      5938930e