1. 12 Apr, 2015 28 commits
  2. 11 Apr, 2015 3 commits
  3. 09 Apr, 2015 5 commits
  4. 07 Apr, 2015 2 commits
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 7abccdba
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-04-04
      
      Here's what's probably the last bluetooth-next pull request for 4.1:
      
       - Fixes for LE advertising data & advertising parameters
       - Fix for race condition with HCI_RESET flag
       - New BNEPGETSUPPFEAT ioctl, needed for certification
       - New HCI request callback type to get the resulting skb
       - Cleanups to use BIT() macro wherever possible
       - Consolidate Broadcom device entries in the btusb HCI driver
       - Check for valid flags in CMTP, HIDP & BNEP
       - Disallow local privacy & OOB data combo to prevent a potential race
       - Expose SMP & ECDH selftest results through debugfs
       - Expose current Device ID info through debugfs
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7abccdba
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c85d6975
      David S. Miller authored
      Conflicts:
      	drivers/net/ethernet/mellanox/mlx4/cmd.c
      	net/core/fib_rules.c
      	net/ipv4/fib_frontend.c
      
      The fib_rules.c and fib_frontend.c conflicts were locking adjustments
      in 'net' overlapping addition and removal of code in 'net-next'.
      
      The mlx4 conflict was a bug fix in 'net' happening in the same
      place a constant was being replaced with a more suitable macro.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c85d6975
  5. 06 Apr, 2015 2 commits
    • Linus Torvalds's avatar
      Linux 4.0-rc7 · f22e6e84
      Linus Torvalds authored
      f22e6e84
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 442bb4ba
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) In TCP, don't register an FRTO for cumulatively ACK'd data that was
          previously SACK'd, from Neal Cardwell.
      
       2) Need to hold RNL mutex in ipv4 multicast code namespace cleanup,
          from Cong WANG.
      
       3) Similarly we have to hold RNL mutex for fib_rules_unregister(), also
          from Cong WANG.
      
       4) Revert and rework netns nsid allocation fix, from Nicolas Dichtel.
      
       5) When we encapsulate for a tunnel device, skb->sk still points to the
          user socket.  So this leads to cases where we retraverse the
          ipv4/ipv6 output path with skb->sk being of some other address
          family (f.e. AF_PACKET).  This can cause things to crash since the
          ipv4 output path is dereferencing an AF_PACKET socket as if it were
          an ipv4 one.
      
          The short term fix for 'net' and -stable is to elide these socket
          checks once we've entered an encapsulation sequence by testing
          xmit_recursion.
      
          Longer term we have a better solution wherein we pass the tunnel's
          socket down through the output paths, but that is way too invasive
          for 'net' and -stable.
      
          From Hannes Frederic Sowa.
      
       6) l2tp_init() failure path forgets to unregister per-net ops, from
          Cong WANG.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net/mlx4_core: Fix error message deprecation for ConnectX-2 cards
        net: dsa: fix filling routing table from OF description
        l2tp: unregister l2tp_net_ops on failure path
        mvneta: dont call mvneta_adjust_link() manually
        ipv6: protect skb->sk accesses from recursive dereference inside the stack
        netns: don't allocate an id for dead netns
        Revert "netns: don't clear nsid too early on removal"
        ip6mr: call del_timer_sync() in ip6mr_free_table()
        net: move fib_rules_unregister() under rtnl lock
        ipv4: take rtnl_lock and mark mrt table as freed on namespace cleanup
        tcp: fix FRTO undo on cumulative ACK of SACKed range
        xen-netfront: transmit fully GSO-sized packets
      442bb4ba