1. 02 Sep, 2012 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0b1a34c9
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) NLA_PUT* --> nla_put_* conversion got one case wrong in
          nfnetlink_log, fix from Patrick McHardy.
      
       2) Missed error return check in ipw2100 driver, from Julia Lawall.
      
       3) PMTU updates in ipv4 were setting the expiry time incorrectly, fix
          from Eric Dumazet.
      
       4) SFC driver erroneously reversed src and dst when reporting filters
          via ethtool.
      
       5) Memory leak in CAN protocol and wrong setting of IRQF_SHARED in
          sja1000 can platform driver, from Alexey Khoroshilov and Sven
          Schmitt.
      
       6) Fix multicast traffic scaling regression in ipv4_dst_destroy, only
          take the lock when we really need to.  From Eric Dumazet.
      
       7) Fix non-root process spoofing in netlink, from Pablo Neira Ayuso.
      
       8) CWND reduction in TCP is done incorrectly during non-SACK recovery,
          fix from Yuchung Cheng.
      
       9) Revert netpoll change, and fix what was actually a driver specific
          problem.  From Amerigo Wang.  This should cure bootup hangs with
          netconsole some people reported.
      
      10) Fix xen-netfront invoking __skb_fill_page_desc() with a NULL page
          pointer.  From Ian Campbell.
      
      11) SIP NAT fix for expectiontation creation, from Pablo Neira Ayuso.
      
      12) __ip_rt_update_pmtu() needs RCU locking, from Eric Dumazet.
      
      13) Fix usbnet deadlock on resume, can't use GFP_KERNEL in this
          situation.  From Oliver Neukum.
      
      14) The davinci ethernet driver triggers an OOPS on removal because it
          frees an MDIO object before unregistering it.  Fix from Bin Liu.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        net: qmi_wwan: add several new Gobi devices
        fddi: 64 bit bug in smt_add_para()
        net: ethernet: fix kernel OOPS when remove davinci_mdio module
        net/xfrm/xfrm_state.c: fix error return code
        net: ipv6: fix error return code
        net: qmi_wwan: new device: Foxconn/Novatel E396
        usbnet: fix deadlock in resume
        cs89x0 : packet reception not working
        netfilter: nf_conntrack: fix racy timer handling with reliable events
        bnx2x: Correct the ndo_poll_controller call
        bnx2x: Move netif_napi_add to the open call
        ipv4: must use rcu protection while calling fib_lookup
        bnx2x: fix 57840_MF pci id
        net: ipv4: ipmr_expire_timer causes crash when removing net namespace
        e1000e: DoS while TSO enabled caused by link partner with small MSS
        l2tp: avoid to use synchronize_rcu in tunnel free function
        gianfar: fix default tx vlan offload feature flag
        netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation
        xen-netfront: use __pskb_pull_tail to ensure linear area is big enough on RX
        netfilter: nfnetlink_log: fix error return code in init path
        ...
      0b1a34c9
    • Bjørn Mork's avatar
      net: qmi_wwan: add several new Gobi devices · 50022005
      Bjørn Mork authored
      Gobi devices are composite, needing both the qcserial and
      qmi_wwan drivers to support all functions.  Re-syncing the
      list of supported devices with qcserial.
      
      Cc: Aleksander Morgado <aleksander@lanedo.com>
      Cc: Thomas Tuttle <ttuttle@chromium.org>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarDavid S. Miller <davem@tempietto.lan>
      50022005
    • Dan Carpenter's avatar
      fddi: 64 bit bug in smt_add_para() · e1b2aa7f
      Dan Carpenter authored
      The intent was to set 4 bytes of data so that's why the sp_len is set
      to 4 on the next line.  The cast to u_long pointer clears 8 bytes
      on 64 bit arches.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@tempietto.lan>
      e1b2aa7f
  2. 01 Sep, 2012 5 commits
  3. 31 Aug, 2012 8 commits
  4. 30 Aug, 2012 18 commits
  5. 29 Aug, 2012 6 commits
    • Alex Deucher's avatar
      drm/radeon: fix dig encoder selection on DCE61 · 41fa5437
      Alex Deucher authored
      Was using the DCE41 code which was wrong. Fixes
      blank displays on a number of Trinity systems.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      41fa5437
    • Amerigo Wang's avatar
      netpoll: revert 6bdb7fe3 and fix be_poll() instead · 072a9c48
      Amerigo Wang authored
      Against -net.
      
      In the patch "netpoll: re-enable irq in poll_napi()", I tried to
      fix the following warning:
      
      [100718.051041] ------------[ cut here ]------------
      [100718.051048] WARNING: at kernel/softirq.c:159 local_bh_enable_ip+0x7d/0xb0()
      (Not tainted)
      [100718.051049] Hardware name: ProLiant BL460c G7
      ...
      [100718.051068] Call Trace:
      [100718.051073]  [<ffffffff8106b747>] ? warn_slowpath_common+0x87/0xc0
      [100718.051075]  [<ffffffff8106b79a>] ? warn_slowpath_null+0x1a/0x20
      [100718.051077]  [<ffffffff810747ed>] ? local_bh_enable_ip+0x7d/0xb0
      [100718.051080]  [<ffffffff8150041b>] ? _spin_unlock_bh+0x1b/0x20
      [100718.051085]  [<ffffffffa00ee974>] ? be_process_mcc+0x74/0x230 [be2net]
      [100718.051088]  [<ffffffffa00ea68c>] ? be_poll_tx_mcc+0x16c/0x290 [be2net]
      [100718.051090]  [<ffffffff8144fe76>] ? netpoll_poll_dev+0xd6/0x490
      [100718.051095]  [<ffffffffa01d24a5>] ? bond_poll_controller+0x75/0x80 [bonding]
      [100718.051097]  [<ffffffff8144fde5>] ? netpoll_poll_dev+0x45/0x490
      [100718.051100]  [<ffffffff81161b19>] ? ksize+0x19/0x80
      [100718.051102]  [<ffffffff81450437>] ? netpoll_send_skb_on_dev+0x157/0x240
      
      by reenabling IRQ before calling ->poll, but it seems more
      problems are introduced after that patch:
      
      http://ozlabs.org/~akpm/stuff/IMG_20120824_122054.jpg
      http://marc.info/?l=linux-netdev&m=134563282530588&w=2
      
      So it is safe to fix be2net driver code directly.
      
      This patch reverts the offending commit and fixes be_poll() by
      avoid disabling BH there, this is okay because be_poll()
      can be called either by poll_napi() which already disables
      IRQ, or by net_rx_action() which already disables BH.
      Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Reported-by: default avatarSylvain Munaut <s.munaut@whatever-company.com>
      Cc: Sylvain Munaut <s.munaut@whatever-company.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: David Miller <davem@davemloft.net>
      Cc: Sathya Perla <sathya.perla@emulex.com>
      Cc: Subbu Seetharaman <subbu.seetharaman@emulex.com>
      Cc: Ajit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Tested-by: default avatarSylvain Munaut <s.munaut@whatever-company.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      072a9c48
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 318e1510
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "I've split out the big send/receive update from my last pull request
        and now have just the fixes in my for-linus branch.  The send/recv
        branch will wander over to linux-next shortly though.
      
        The largest patches in this pull are Josef's patches to fix DIO
        locking problems and his patch to fix a crash during balance.  They
        are both well tested.
      
        The rest are smaller fixes that we've had queued.  The last rc came
        out while I was hacking new and exciting ways to recover from a
        misplaced rm -rf on my dev box, so these missed rc3."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
        Btrfs: fix that repair code is spuriously executed for transid failures
        Btrfs: fix ordered extent leak when failing to start a transaction
        Btrfs: fix a dio write regression
        Btrfs: fix deadlock with freeze and sync V2
        Btrfs: revert checksum error statistic which can cause a BUG()
        Btrfs: remove superblock writing after fatal error
        Btrfs: allow delayed refs to be merged
        Btrfs: fix enospc problems when deleting a subvol
        Btrfs: fix wrong mtime and ctime when creating snapshots
        Btrfs: fix race in run_clustered_refs
        Btrfs: don't run __tree_mod_log_free_eb on leaves
        Btrfs: increase the size of the free space cache
        Btrfs: barrier before waitqueue_active
        Btrfs: fix deadlock in wait_for_more_refs
        btrfs: fix second lock in btrfs_delete_delayed_items()
        Btrfs: don't allocate a seperate csums array for direct reads
        Btrfs: do not strdup non existent strings
        Btrfs: do not use missing devices when showing devname
        Btrfs: fix that error value is changed by mistake
        Btrfs: lock extents as we map them in DIO
        ...
      318e1510
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · a7ccbcf3
      Linus Torvalds authored
      Pull watchdog fixes from Wim Van Sebroeck:
       "This will fix a warning for watchdog-test.c and it will remove a
        duplicate include of delay.h"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: da9052: Remove duplicate inclusion of delay.h
        watchdog: fix watchdog-test.c build warning
      a7ccbcf3
    • David Rientjes's avatar
      mm, slab: lock the correct nodelist after reenabling irqs · 51cd8e6f
      David Rientjes authored
      cache_grow() can reenable irqs so the cpu (and node) can change, so ensure
      that we take list_lock on the correct nodelist.
      
      This fixes an issue with commit 072bb0aa ("mm: sl[au]b: add
      knowledge of PFMEMALLOC reserve pages") where list_lock for the wrong
      node was taken after growing the cache.
      Reported-and-tested-by: default avatarHaggai Eran <haggaie@mellanox.com>
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      51cd8e6f
    • Christian König's avatar
      drm/radeon: fix double free in radeon_gpu_reset · f54b350d
      Christian König authored
      radeon_ring_restore is freeing the memory for the saved
      ring data. We need to remember that, otherwise we try to
      restore the ring data again on the next try. Additional
      to that it shouldn't try the reset infinitely if we have
      saved ring data.
      Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      f54b350d