Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.34-rc2-gi…
Commits on Mar 29, 2010
  1. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Fix a race in o2dlm lockres mastery
      Ocfs2: Handle deletion of reflinked oprhan inodes correctly.
      Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir.
      ocfs2: Clear undo bits when local alloc is freed
      ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
      ocfs2: Fix the update of name_offset when removing xattrs
      ocfs2: Always try for maximum bits with new local alloc windows
      ocfs2: set i_mode on disk during acl operations
      ocfs2: Update i_blocks in reflink operations.
      ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
      [PATCH] Skip check for mandatory locks when unlocking
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
      ceph: update discussion list address in MAINTAINERS
      ceph: some documentations fixes
      ceph: fix use after free on mds __unregister_request
      ceph: avoid loaded term 'OSD' in documention
      ceph: fix possible double-free of mds request reference
      ceph: fix session check on mds reply
      ceph: handle kmalloc() failure
      ceph: propagate mds session allocation failures to caller
      ceph: make write_begin wait propagate ERESTARTSYS
      ceph: fix snap rebuild condition
      ceph: avoid reopening osd connections when address hasn't changed
      ceph: rename r_sent_stamp r_stamp
      ceph: fix connection fault con_work reentrancy problem
      ceph: prevent dup stale messages to console for restarting mds
      ceph: fix pg pool decoding from incremental osdmap update
      ceph: fix mds sync() race with completing requests
      ceph: only release unused caps with mds requests
      ceph: clean up handle_cap_grant, handle_caps wrt session mutex
      ceph: fix session locking in handle_caps, ceph_check_caps
      ceph: drop unnecessary WARN_ON in caps migration
      ...
  3. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (asc7621) Add X58 entry in Kconfig
      hwmon: (w83793) Saving negative errors in unsigned
      hwmon: (coretemp) Add missing newline to dev_warn() message
      hwmon: (coretemp) Fix cpu model output
  4. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_via: fix VT6410/6415/6330 detection issue
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
      r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
      ipv6: Don't drop cache route entry unless timer actually expired.
      tulip: Add missing parens.
      r8169: fix broken register writes
      pcnet_cs: add new id
      bonding: fix broken multicast with round-robin mode
      drivers/net: Fix continuation lines
      e1000: do not modify tx_queue_len on link speed change
      net: ipmr/ip6mr: prevent out-of-bounds vif_table access
      ixgbe: Do not run all Diagnostic offline tests when VFs are active
      igb: use correct bits to identify if managability is enabled
      benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c
      net: Add MSG_WAITFORONE flag to recvmmsg
      e1000e: do not modify tx_queue_len on link speed change
      igbvf: do not modify tx_queue_len on link speed change
      ipv4: Restart rt_intern_hash after emergency rebuild (v2)
      ipv4: Cleanup struct net dereference in rt_intern_hash
      net: fix netlink address dumping in IPv4/IPv6
      tulip: Fix null dereference in uli526x_rx_packet()
      gianfar: fix undo of reserve()
      ...
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Properly truncate pt_regs framepointer in perf callback.
      arch/sparc/kernel: Use set_cpus_allowed_ptr
      sparc: Fix use of uid16_t and gid16_t in asm/stat.h
  7. @torvalds

    ext3: fix broken handling of EXT3_STATE_NEW

    torvalds authored
    In commit 9df9393 ("ext3: Use bitops to read/modify
    EXT3_I(inode)->i_state") ext3 changed its internal 'i_state' variable to
    use bitops for its state handling.  However, unline the same ext4
    change, it didn't actually change the name of the field when it changed
    the semantics of it.
    
    As a result, an old use of 'i_state' remained in fs/ext3/ialloc.c that
    initialized the field to EXT3_STATE_NEW.  And that does not work
    _at_all_ when we're now working with individually named bits rather than
    values that get masked.  So the code tried to mark the state to be new,
    but in actual fact set the field to EXT3_STATE_JDATA.  Which makes no
    sense at all, and screws up all the code that checks whether the inode
    was newly allocated.
    
    In particular, it made the xattr code unhappy, and caused various random
    behavior, like apparently
    
    	https://bugzilla.redhat.com/show_bug.cgi?id=577911
    
    So fix the initialization, and rename the field to match ext4 so that we
    don't have this happen again.
    
    Cc: James Morris <jmorris@namei.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Cc: Daniel J Walsh <dwalsh@redhat.com>
    Cc: Eric Paris <eparis@redhat.com>
    Cc: Jan Kara <jack@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @davem330

    r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)

    Neil Horman authored davem330 committed
    Official patch to fix the r8169 frame length check error.
    
    Based on this initial thread:
    http://marc.info/?l=linux-netdev&m=126202972828626&w=1
    This is the official patch to fix the frame length problems in the r8169
    driver.  As noted in the previous thread, while this patch incurs a performance
    hit on the driver, its possible to improve performance dynamically by updating
    the mtu and rx_copybreak values at runtime to return performance to what it was
    for those NICS which are unaffected by the ideosyncracy (if there are any).
    
    Summary:
    
        A while back Eric submitted a patch for r8169 in which the proper
    allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
    much data.  This was done in commit fdd7b4c.  A
    long time prior to that however, Francois posted
    126fa4b, which expiclitly disabled the MaxSize
    setting due to the fact that the hardware behaved in odd ways when overlong
    frames were received on NIC's supported by this driver.  This was mentioned in a
    security conference recently:
    http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
    
    It seems that if we can't enable frame size filtering, then, as Eric correctly
    noticed, we can find ourselves DMA-ing too much data to a buffer, causing
    corruption.  As a result is seems that we are forced to allocate a frame which
    is ready to handle a maximally sized receive.
    
    This obviously has performance issues with it, so to mitigate that issue, this
    patch does two things:
    
    1) Raises the copybreak value to the frame allocation size, which should force
    appropriately sized packets to get allocated on rx, rather than a full new 16k
    buffer.
    
    2) This patch only disables frame filtering initially (i.e., during the NIC
    open), changing the MTU results in ring buffer allocation of a size in relation
    to the new mtu (along with a warning indicating that this is dangerous).
    
    Because of item (2), individuals who can't cope with the performance hit (or can
    otherwise filter frames to prevent the bug), or who have hardware they are sure
    is unaffected by this issue, can manually lower the copybreak and reset the mtu
    such that performance is restored easily.
    
    Signed-off-by: Neil Horman <nhorman@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @davem330

    sparc64: Properly truncate pt_regs framepointer in perf callback.

    davem330 authored
    For 32-bit processes, we save the full 64-bits of the regs in pt_regs.
    
    But unlike when the userspace actually does load and store
    instructions, the top 32-bits don't get automatically truncated by the
    cpu in kernel mode (because the kernel doesn't execute with PSTATE_AM
    address masking enabled).
    
    So we have to do it by hand.
    
    Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. hwmon: (asc7621) Add X58 entry in Kconfig

    Jaswinder Singh Rajput authored Jean Delvare committed
    Intel X58 have asc7621a chip. So added X58 entry in Kconfig for asc7621.
    Also arranged existing models in ascending order.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  11. @error27

    hwmon: (w83793) Saving negative errors in unsigned

    error27 authored Jean Delvare committed
    "ret" is used to store the return value for watchdog_trigger() and it
    should be signed for the error handling to work.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  12. hwmon: (coretemp) Add missing newline to dev_warn() message

    Dean Nelson authored Jean Delvare committed
    Add missing newline to dev_warn() message string. This is more of an issue
    with older kernels that don't automatically add a newline if it was missing
    from the end of the previous line.
    
    Signed-off-by: Dean Nelson <dnelson@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  13. @prarit

    hwmon: (coretemp) Fix cpu model output

    prarit authored Jean Delvare committed
    Avoid hex and decimal confusion when printing out the cpu model.
    
    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  14. @liewegas

    ceph: update discussion list address in MAINTAINERS

    liewegas authored
    Signed-off-by: Sage Weil <sage@newdream.net>
  15. @crquan @liewegas

    ceph: some documentations fixes

    crquan authored liewegas committed
    New documentation should have an entry in the 00-INDEX.  Correct git
    urls.
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Sage Weil <sage@newdream.net>
  16. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
      Revert "ide: skip probe if there are no devices on the port (v2)"
      Revert "via82cxxx: workaround h/w bugs"
  17. @torvalds

    frv/chris: fix lines with a missing semicolons

    David Howells authored torvalds committed
    Commit b26b2d4 ("resource/PCI: align functions now return start
    of resource") added lines with missing semicolons.
    
    Add the missing semicolons to the FRV and CRIS arch code.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Cc: linux@dominikbrodowski.net
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @torvalds

    SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG

    David Howells authored torvalds committed
    CONFIG_SLOW_WORK_PROC was changed to CONFIG_SLOW_WORK_DEBUG, but not in all
    instances.  Change the remaining instances.  This makes the debugfs file
    display the time mark and the owner's description again.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. @torvalds

    slow-work: use get_ref wrapper instead of directly calling get_ref

    Dave Airlie authored torvalds committed
    Otherwise we can get an oops if the user has no get_ref/put_ref
    requirement.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda: Use LPIB for ga-ma770-ud3 board
      ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
      ALSA: pcm_lib - fix xrun functionality
      ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
      ALSA: hda - Don't set invalid connection index in Realtek initialiaiton
  21. @draconx @torvalds

    Staging: et131x: Properly disable FC in txmac.

    draconx authored torvalds committed
    FC disable is bit 3 of the txmac ctl register, but commit 6720949
    ("Staging: et131x: Kil the txmac type") accidentally changed the code to
    set bit 2 instead.
    
    Signed-off-by: Nick Bowler <nbowler@draconx.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @tiwai
  23. @tiwai
  24. @crimsun @tiwai

    ALSA: hda: Use LPIB for ga-ma770-ud3 board

    crimsun authored tiwai committed
    BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669
    
    The OR states that position_fix=1 is necessary to work around glitching
    during volume adjustments using PulseAudio.
    
    Reported-by: Carlos Laviola <claviola@debian.org>
    Tested-by: Carlos Laviola <claviola@debian.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  25. @crimsun @tiwai

    ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist

    crimsun authored tiwai committed
    BugLink: https://launchpad.net/bugs/481058
    
    The OR has verified that both 'Headphone Jack Sense' and 'Line Jack Sense'
    need to be muted for sound to be audible, so just add the machine's SSID
    to the ac97 jack sense blacklist.
    
    Reported-by: Richard Gagne
    Tested-by: Richard Gagne
    Cc: <stable@kernel.org>
    Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  26. @liewegas

    ceph: fix use after free on mds __unregister_request

    liewegas authored
    There was a use after free in __unregister_request that would trigger
    whenever the request map held the last reference.  This appears to have
    triggered an oops during 'umount -f' when requests are being torn down.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
  27. @davem330

    ipv6: Don't drop cache route entry unless timer actually expired.

    YOSHIFUJI Hideaki / 吉藤英明 authored davem330 committed
    This is ipv6 variant of the commit 5e016cb.. ("ipv4: Don't drop
    redirected route cache entry unless PTMU actually expired")
    by Guenter Roeck <guenter.roeck@ericsson.com>.
    
    Remove cache route entry in ipv6_negative_advice() only if
    the timer is expired.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  28. @davem330

    Revert "ide: skip probe if there are no devices on the port (v2)"

    davem330 authored
    This reverts commit a20b2a4.
    
    As requested by David Fries.  This makes CDROMs which are slave drives
    on a ribbon without a master disappear and causes other similar kinds
    of badness.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  29. @davem330

    tulip: Add missing parens.

    davem330 authored
    As reported by Stephen Rothwell.
    
    drivers/net/tulip/uli526x.c: In function 'uli526x_rx_packet':
    drivers/net/tulip/uli526x.c:861: warning: assignment makes pointer from integer without a cast
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Mar 28, 2010
  1. pata_via: fix VT6410/6415/6330 detection issue

    JosephChan@via.com.tw authored Jeff Garzik committed
    When using VT6410/6415/6330 chips on some VIA's platforms, the HDD
    connection to VT6410/6415/6330 cannot be detected.
    
    It is because the driver detects wrong via_isa_bridge ID, and then
    causes this issue to happen.
    
    Signed-off-by: Joseph Chan <josephchan@via.com.tw>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  2. @JuliaLawall @davem330

    arch/sparc/kernel: Use set_cpus_allowed_ptr

    JuliaLawall authored davem330 committed
    Use set_cpus_allowed_ptr rather than set_cpus_allowed.
    
    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression E1,E2;
    @@
    
    - set_cpus_allowed(E1, cpumask_of_cpu(E2))
    + set_cpus_allowed_ptr(E1, cpumask_of(E2))
    
    @@
    expression E;
    identifier I;
    @@
    
    - set_cpus_allowed(E, I)
    + set_cpus_allowed_ptr(E, &I)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @davem330

    r8169: fix broken register writes

    Francois Romieu authored davem330 committed
    This is quite similar to b39fe41
    though said registers are not even documented as 64-bit registers
    - as opposed to the initial TxDescStartAddress ones - but as single
    bytes which must be combined into 32 bits at the MMIO read/write
    level before being merged into a 64 bit logical entity.
    
    Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR
    registers (aka "multicast is broken for ages on ARM) and to
    Timo Teräs <timo.teras@iki.fi> for the MAC registers.
    
    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Mar 27, 2010
  1. @davem330

    pcnet_cs: add new id

    Ken Kawasaki authored davem330 committed
    pcnet_cs:
     *add new id (Allied Telesis LM33-PCM-T Lan&Modem multifunction card)
     *use PROD_ID for LA-PCM.(because LA-PCM and LM33-PCM-T use the same MANF_ID).
    
    Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    bonding: fix broken multicast with round-robin mode

    Andy Gospodarek authored davem330 committed
    Round-robin (mode 0) does nothing to ensure that any multicast traffic
    originally destined for the host will continue to arrive at the host when
    the link that sent the IGMP join or membership report goes down.  One of
    the benefits of absolute round-robin transmit.
    
    Keeping track of subscribed multicast groups for each slave did not seem
    like a good use of resources, so I decided to simply send on the
    curr_active slave of the bond (typically the first enslaved device that
    is up).  This makes failover management simple as IGMP membership
    reports only need to be sent when the curr_active_slave changes.  I
    tested this patch and it appears to work as expected.
    
    Originally reported by Lon Hohberger <lhh@redhat.com>.
    
    Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
    CC: Lon Hohberger <lhh@redhat.com>
    CC: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @landley @davem330

    sparc: Fix use of uid16_t and gid16_t in asm/stat.h

    landley authored davem330 committed
    Signed-off-by: Rob Landley <rob@landley.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.