1. 30 6月, 2010 15 次提交
  2. 28 6月, 2010 4 次提交
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · 93416253
      Linus Torvalds 提交于
      * 'for-linus' of git://neil.brown.name/md:
        md/raid5: don't include 'spare' drives when reshaping to fewer devices.
        md/raid5: add a missing 'continue' in a loop.
        md/raid5: Allow recovered part of partially recovered devices to be in-sync
        md/raid5: More careful check for "has array failed".
        md: Don't update ->recovery_offset when reshaping an array to fewer devices.
        md/raid5: avoid oops when number of devices is reduced then increased.
        md: enable raid4->raid0 takeover
        md: clear layout after ->raid0 takeover
        md: fix raid10 takeover: use new_layout for setup_conf
        md: fix handling of array level takeover that re-arranges devices.
        md: raid10: Fix null pointer dereference in fix_read_error()
        Restore partition detection of newly created md arrays.
      93416253
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · b4322e70
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: fix first chunk match in per_cpu_ptr_to_phys()
        percpu: fix trivial bugs in pcpu_build_alloc_info()
      b4322e70
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 31cafd95
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
        phylib: Add autoload support for the LXT973 phy.
        ISDN: hysdn, fix potential NULL dereference
        vxge: fix memory leak in vxge_alloc_msix() error path
        isdn/gigaset: correct CAPI connection state storage
        isdn/gigaset: encode HLC and BC together
        isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation
        isdn/gigaset: correct CAPI voice connection encoding
        isdn/gigaset: honor CAPI application's buffer size request
        cpmac: do not leak struct net_device on phy_connect errors
        smc91c92_cs: fix the problem that lan & modem does not work simultaneously
        ipv6: fix NULL reference in proxy neighbor discovery
        Bluetooth: Bring back var 'i' increment
        xfrm: check bundle policy existance before dereferencing it
        sky2: enable rx/tx in sky2_phy_reinit()
        cnic: Disable statistics initialization for eth clients that do not support statistics
        net: add dependency on fw class module to qlcnic and netxen_nic
        snmp: fix SNMP_ADD_STATS()
        hso: remove setting of low_latency flag
        udp: Fix bogus UFO packet generation
        lasi82596: fix netdev_mc_count conversion
        ...
      31cafd95
    • L
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · e7865c23
      Linus Torvalds 提交于
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFSv4: Fix an embarassing typo in encode_attrs()
        NFSv4: Ensure that /proc/self/mountinfo displays the minor version number
        NFSv4.1: Ensure that we initialise the session when following a referral
        SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()
        nfs4 use mandatory attribute file type in nfs4_get_root
      e7865c23
  3. 27 6月, 2010 21 次提交