1. 31 5月, 2013 4 次提交
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · fb68e2f4
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Please pull this batch of fixes intended for the 3.10 stream...
      
      Regarding the NFC bits, Samuel says:
      
      "This is the first batch of NFC fixes for 3.10, and it contains:
      
      - 3 fixes for the NFC MEI support:
              * We now depend on the correct Kconfig symbol.
              * We register an MEI event callback whenever we enable an NFC device,
                otherwise we fail to read anything after an enable/disable cycle.
              * We only disable an MEI device from its disable mey_phy_ops,
                preventing useless consecutive disable calls.
      
      - An NFC Makefile cleanup, as I forgot to remove a commented out line when
        moving the LLCP code to the NFC top level directory."
      
      As for the mac80211 bits, Johannes says:
      
      "This time I have a fix from Stanislaw for a stupid mistake I made in the
      auth/assoc timeout changes, a fix from Felix for 64-bit traffic counters
      and one from Helmut for address mask handling in mac80211. I also have a
      few fixes myself for four different crashes reported by a few people."
      
      And Johannes says this about the iwlwifi bit:
      
      "This fixes a brown paper-bag bug that we really should've caught in
      review. More details in the changelog for the fix."
      
      On top of that...
      
      Arend van Spriel and Hante Meuleman cooperate to send a series of AP
      and P2P mode fixes for brcmfmac.
      
      Gabor Juhos corrects a register offset for AR9550, avoiding a bus
      error.
      
      Dan Carpenter provides a fixup to some dmesg output in the atmel
      driver.
      
      And, finally...
      
      Felix Fietkau not only gives us a trio of small AR934x fixes, but
      also refactors the ath9k aggregation session start/stop handling
      (using the generic mac80211 support) in order to avoid a deadlock.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fb68e2f4
    • S
      be2net: Fix crash on 2nd invocation of PCI AER/EEH error_detected hook · 01e5b2c4
      Somnath Kotur 提交于
      During a PCI EEH/AER error recovery flow, if the device did not successfully
      restart, the error_detected() hook may be called a second time with a
      "perm_failure" state. This patch skips over driver cleanup for the second
      invocation of the callback.
      
      Also, Lancer error recovery code is fixed-up to handle these changes.
      Signed-off-by: NKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: NSomnath kotur <somnath.kotur@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      01e5b2c4
    • S
      be2net: Mark checksum fail for IP fragmented packets · e38b1706
      Somnath Kotur 提交于
      HW does not compute L4 checksum for IP Fragmented packets.
      Signed-off-by: NKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: NSomnath Kotur <somnath.kotur@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e38b1706
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 73ce00d4
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains Netfilter/IPVS fixes for 3.10-rc3,
      they are:
      
      * fix xt_addrtype with IPv6, from Florian Westphal. This required
        a new hook for IPv6 functions in the netfilter core to avoid
        hard dependencies with the ipv6 subsystem when this match is
        only used for IPv4.
      
      * fix connection reuse case in IPVS. Currently, if an reused
        connection are directed to the same server. If that server is
        down, those connection would fail. Therefore, clear the
        connection and choose a new server among the available ones.
      
      * fix possible non-nul terminated string sent to user-space if
        ipt_ULOG is used as the default netfilter logging stub, from
        Chen Gang.
      
      * fix mark logging of IPv6 packets in xt_LOG, from Michal Kubecek.
        This bug has been there since 2.6.26.
      
      * Fix breakage ip_vs_sh due to incorrect structure layout for
        RCU, from Jan Beulich.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      73ce00d4
  2. 29 5月, 2013 16 次提交
  3. 28 5月, 2013 2 次提交
  4. 27 5月, 2013 5 次提交
  5. 26 5月, 2013 3 次提交
  6. 25 5月, 2013 3 次提交
  7. 24 5月, 2013 7 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 0e255f1c
      Linus Torvalds 提交于
      Pull gfs2 fixes from Steven Whitehouse:
       "This time there are just four fixes.  There are a couple of minor
        updates to the quota code, a fix for KConfig to ensure that only valid
        combinations including GFS2 can be built, and a fix for a typo
        affecting end i/o processing when writing the journal.
      
        Also, there is a temporary fix for a performance regression relating
        to block reservations and directories.  A longer fix will be applied
        in due course, but this deals with the most immediate problem for now"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
        GFS2: Fix typo in gfs2_log_end_write loop
        GFS2: fix DLM depends to fix build errors
        GFS2: Use single-block reservations for directories
        GFS2: two minor quota fixups
      0e255f1c
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · d4c2456a
      Linus Torvalds 提交于
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Some more P8 related bits, a bunch of fixes for our P7+/P8 HW crypto
        drivers, some added workarounds for those radeons that don't do proper
        64-bit MSIs and a couple of other trivialities by myself."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support
        powerpc/powernv: Build a zImage.epapr
        powerpc: Make radeon 32-bit MSI quirk work on powernv
        powerpc: Context switch more PMU related SPRs
        powerpc/powernv: Fix condition for when to invalidate the TCE cache
        powerpc/pci: Fix bogus message at boot about empty memory resources
        powerpc: Fix TLB cleanup at boot on POWER8
        drivers/crypto/nx: Fixes for multiple races and issues
      d4c2456a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · eb3d3390
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "It's been a while since my last pull request so quite a few fixes have
        piled up."
      
      Indeed.
      
       1) Fix nf_{log,queue} compilation with PROC_FS disabled, from Pablo
          Neira Ayuso.
      
       2) Fix data corruption on some tg3 chips with TSO enabled, from Michael
          Chan.
      
       3) Fix double insertion of VLAN tags in be2net driver, from Sarveshwar
          Bandi.
      
       4) Don't have TCP's MD5 support pass > PAGE_SIZE page offsets in
          scatter-gather entries into the crypto layer, the crypto layer can't
          handle that.  From Eric Dumazet.
      
       5) Fix lockdep splat in 802.1Q MRP code, also from Eric Dumazet.
      
       6) Fix OOPS in netfilter log module when called from conntrack, from
          Hans Schillstrom.
      
       7) FEC driver needs to use netif_tx_{lock,unlock}_bh() rather than the
          non-BH disabling variants.  From Fabio Estevam.
      
       8) TCP GSO can generate out-of-order packets, fix from Eric Dumazet.
      
       9) vxlan driver doesn't update 'used' field of fdb entries when it
          should, from Sridhar Samudrala.
      
      10) ipv6 should use kzalloc() to allocate inet6 socket cork options,
          otherwise we can OOPS in ip6_cork_release().  From Eric Dumazet.
      
      11) Fix races in bonding set mode, from Nikolay Aleksandrov.
      
      12) Fix checksum generation regression added by "r8169: fix 8168evl
          frame padding.", from Francois Romieu.
      
      13) ip_gre can look at stale SKB data pointer, fix from Eric Dumazet.
      
      14) Fix checksum handling when GSO is enabled in bnx2x driver with
          certain chips, from Yuval Mintz.
      
      15) Fix double free in batman-adv, from Martin Hundebøll.
      
      16) Fix device startup synchronization with firmware in tg3 driver, from
          Nithin Sujit.
      
      17) perf networking dropmonitor doesn't work at all due to mixed up
          trace parameter ordering, from Ben Hutchings.
      
      18) Fix proportional rate reduction handling in tcp_ack(), from Nandita
          Dukkipati.
      
      19) IPSEC layer doesn't return an error when a valid state is detected,
          causing an OOPS.  Fix from Timo Teräs.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)
        be2net: bug fix on returning an invalid nic descriptor
        tcp: xps: fix reordering issues
        net: Revert unused variable changes.
        xfrm: properly handle invalid states as an error
        virtio_net: enable napi for all possible queues during open
        tcp: bug fix in proportional rate reduction.
        net: ethernet: sun: drop unused variable
        net: ethernet: korina: drop unused variable
        net: ethernet: apple: drop unused variable
        qmi_wwan: Added support for Cinterion's PLxx WWAN Interface
        perf: net_dropmonitor: Remove progress indicator
        perf: net_dropmonitor: Use bisection in symbol lookup
        perf: net_dropmonitor: Do not assume ordering of dictionaries
        perf: net_dropmonitor: Fix symbol-relative addresses
        perf: net_dropmonitor: Fix trace parameter order
        net: fec: use a more proper compatible string for MVF type device
        qlcnic: Fix updating netdev->features
        qlcnic: remove netdev->trans_start updates within the driver
        qlcnic: Return proper error codes from probe failure paths
        tg3: Update version to 3.132
        ...
      eb3d3390
    • S
      GFS2: Fix typo in gfs2_log_end_write loop · e97e548b
      Steven Whitehouse 提交于
      There was a missing _all in this loop iterator
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      e97e548b
    • R
      GFS2: fix DLM depends to fix build errors · 75f96ce6
      Randy Dunlap 提交于
      Fix build errors by correcting DLM dependencies in GFS2.
      Build errors happen when CONFIG_GFS2_FS_LOCKING_DLM=y and CONFIG_DLM=m:
      
      fs/built-in.o: In function `gfs2_lock':
      file.c:(.text+0xc7abd): undefined reference to `dlm_posix_get'
      file.c:(.text+0xc7ad0): undefined reference to `dlm_posix_unlock'
      file.c:(.text+0xc7ad9): undefined reference to `dlm_posix_lock'
      fs/built-in.o: In function `gdlm_unmount':
      lock_dlm.c:(.text+0xd6e5b): undefined reference to `dlm_release_lockspace'
      fs/built-in.o: In function `sync_unlock':
      lock_dlm.c:(.text+0xd6e9e): undefined reference to `dlm_unlock'
      fs/built-in.o: In function `sync_lock':
      lock_dlm.c:(.text+0xd6fb6): undefined reference to `dlm_lock'
      fs/built-in.o: In function `gdlm_put_lock':
      lock_dlm.c:(.text+0xd7238): undefined reference to `dlm_unlock'
      fs/built-in.o: In function `gdlm_mount':
      lock_dlm.c:(.text+0xd753e): undefined reference to `dlm_new_lockspace'
      lock_dlm.c:(.text+0xd79d3): undefined reference to `dlm_release_lockspace'
      fs/built-in.o: In function `gdlm_lock':
      lock_dlm.c:(.text+0xd8179): undefined reference to `dlm_lock'
      fs/built-in.o: In function `gdlm_cancel':
      lock_dlm.c:(.text+0xd6b22): undefined reference to `dlm_unlock'
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      75f96ce6
    • B
      GFS2: Use single-block reservations for directories · af21ca8e
      Bob Peterson 提交于
      This patch changes the multi-block allocation code, such that
      directory inodes only get a single block reserved in the bitmap.
      That way, the bitmaps are more tightly packed together, and there
      are fewer spans of free blocks for in-use block reservations.
      This means it takes less time to find a free span of blocks in the
      bitmap, which speeds things up. This increases the performance of
      some workloads by almost 2X. In Nate's mockup.py script (which does
      (1) create dir, (2) create dir in dir, (3) create file in that dir)
      the test executes in 23 steps rather than 43 steps, a 47%
      performance improvement.
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      af21ca8e
    • B
      GFS2: two minor quota fixups · 37f71577
      Bob Peterson 提交于
      This patch fixes two regression problems that Abhi found in the
      GFS2 quota code.
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      37f71577