Permalink
Switch branches/tags
Commits on Feb 20, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds committed Feb 20, 2010
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] megaraid_sas: fix for 32bit apps
      [SCSI] fcoe: Only rmmod fcoe.ko if there are no active connections
      [SCSI] libfcoe: Send port LKA every FIP_VN_KA_PERIOD secs.
      [SCSI] libfc: Don't assume response request present.
      [SCSI] libfc: Fix e_d_tov ns -> ms scaling factor in PLOGI response.
      [SCSI] libfc: call ddp setup for only FCP reads to avoid accessing junk fsp pointer
      [SCSI] iscsi_tcp regression: remove bogus warn on in write path
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Feb 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances
      sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()
      net-sysfs: Use rtnl_trylock in wireless sysfs methods.
      net: Fix sysctl restarts...
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Feb 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix sun4u execute bit check in TSB I-TLB load.
      sparc: Fix incorrect comparison in of_bus_ambapp_match()
      sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.
      sparc64: Tighten checks in kstack_valid().
  4. Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Feb 20, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon: bump the UMS driver version number to indicate rv740 fix
      drm/radeon/kms: free fence IB if it wasn't emited at IB free time
      drm/ttm: fix caching problem on non-PAT systems.
      drm/radeon/rv740: fix backend setup
      drm/radeon/kms: fix shared ddc detection
      drm/radeon/kms/rs600: add connector quirk
      vgaarb: fix "target=default" passing
Commits on Feb 19, 2010
  1. sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances

    Ben Hutchings committed with davem330 Feb 19, 2010
    The temperature and voltage limits currently set on these boards are
    too conservative and will cause the driver to stop the net device
    erroneously in some systems.
    
    Based on a review of the chip datasheets and advice from the designer
    of these boards:
    
    - Raise the maximum board temperatures to the specified maximum ambient
      temperatures for their PHYs plus the expected temperature bias of the
      board
    - Raise the maximum controller temperature to 90 degrees
    - Lower the minimum temperatures to 0 degrees
    - Widen the voltage tolerances to at least +/- 10%
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()

    Ben Hutchings committed with davem330 Feb 19, 2010
    efx_mcdi_poll() uses positive error numbers, matching the MCDI
    protocol.  It must negate the result of efx_mcdi_poll_reboot() which
    returns the usual negative error numbers.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. net-sysfs: Use rtnl_trylock in wireless sysfs methods.

    ebiederm committed with davem330 Feb 19, 2010
    The wireless sysfs methods like the rest of the networking sysfs
    methods are removed with the rtnl_lock held and block until
    the existing methods stop executing.  So use rtnl_trylock
    and restart_syscall so that the code continues to work.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. net: Fix sysctl restarts...

    ebiederm committed with davem330 Feb 19, 2010
    Yuck.  It turns out that when we restart sysctls we were restarting
    with the values already changed.  Which unfortunately meant that
    the second time through we thought there was no change and skipped
    all kinds of work, despite the fact that there was indeed a change.
    
    I have fixed this the simplest way possible by restoring the changed
    values when we restart the sysctl write.
    
    One of my coworkers spotted this bug when after disabling forwarding
    on an interface pings were still forwarded.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. sparc64: Fix sun4u execute bit check in TSB I-TLB load.

    davem330 committed Feb 19, 2010
    Thanks to testcase and report from Brad Spengler:
    
    --------------------
    #include <stdio.h>
    
    typedef int (* _wee)(void);
    
    int main(void)
    {
            char buf[8] = { '\x81', '\xc7', '\xe0', '\x08', '\x81', '\xe8',
                            '\x00', '\x00' };
            _wee wee;
            printf("%p\n", &buf);
            wee = (_wee)&buf;
            wee();
    
            return 0;
    }
    --------------------
    
    TSB I-tlb load code tries to use andcc to check the _PAGE_EXEC_4U bit,
    but that's bit 12 so it gets sign extended all the way up to bit 63
    and the test nearly always passes as a result.
    
    Use sethi to fix the bug.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. drm/radeon: bump the UMS driver version number to indicate rv740 fix

    Dave Airlie committed Feb 19, 2010
    This lets UMS userspace know the rv740 fix is in. For KMS we can
    consider the kernel release to be the v2.0.0 release so we don't need the
    bump there.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. drm/radeon/kms: free fence IB if it wasn't emited at IB free time

    Jerome Glisse committed with Dave Airlie Feb 18, 2010
    If at IB free time fence wasn't emited that means the IB wasn't
    scheduled because an error occured somewhere, thus we can free
    then fence and mark the IB as free.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  8. drm/ttm: fix caching problem on non-PAT systems.

    curro committed with Dave Airlie Feb 19, 2010
    http://bugzilla.kernel.org/show_bug.cgi?id=15328
    
    This fixes a serious regression on AGP/non-PAT systems, where
    pages were ending up in the wrong state and slowing down the
    whole system.
    
    [airlied: taken this from the bug as the other option is to revert
    the change which caused it].
    
    Tested-by: John W. Linville (in bug).
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. drm/radeon/rv740: fix backend setup

    Alex Deucher committed with Dave Airlie Feb 19, 2010
    This patch fixes occlusion queries and rendering errors
    on rv740 boards. Hardcoding the backend map is not an optimal
    solution, but a better fix is being worked on.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  10. drm/radeon/kms: fix shared ddc detection

    Alex Deucher committed with Dave Airlie Feb 19, 2010
    Just compare the i2c id since the i2c structs
    may be slighly different.
    
    Fixes fdo bug 26616.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  11. drm/radeon/kms/rs600: add connector quirk

    Alex Deucher committed with Dave Airlie Feb 18, 2010
    rs600 board lists DVI port as HDMI.
    
    Fixes fdo bug 26605
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. vgaarb: fix "target=default" passing

    jkkm committed with Dave Airlie Feb 16, 2010
    Commit 77c1ff3 fixed the userspace
    pointer dereference, but introduced another bug pointed out by Eugene Teo
    in RH bug #564264. Instead of comparing the point we were at in the string,
    we instead compared the beginning of the string to "default".
    
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Reported-by: Eugene Teo <eteo@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. [SCSI] megaraid_sas: fix for 32bit apps

    Tomas Henzl committed with James Bottomley Feb 11, 2010
    It looks like this patch -
    
    commit 7b2519a
    Author: Yang, Bo <Bo.Yang@lsi.com>
    Date:   Tue Oct 6 14:52:20 2009 -0600
    
        [SCSI] megaraid_sas: fix 64 bit sense pointer truncation
    
    has caused a problem for 32bit programs with 64bit os -
    
    http://bugzilla.kernel.org/show_bug.cgi?id=15001
    
    fix by converting the user space 32bit pointer to a 64 bit one when
    needed.
    
    [jejb: fix up some 64 bit warnings]
    Signed-off-by: Tomas Henzl <thenzl@redhat.com>
    Cc: Bo Yang <Bo.Yang@lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Commits on Feb 18, 2010
  1. Orphan DECnet

    Christine Caulfield committed with torvalds Feb 18, 2010
    Due to lack of time, space, motivation, hardware and probably expertise,
    I have reluctantly decided to orphan the DECnet code in the kernel.
    
    Judging by the deafening silence on the linux-decnet mailing list I
    suspect it's either not being used anyway, or the few people that are
    using it are happy with their older kernels.
    
    Signed-off-by: Christine Caulfield <christine.caulfield@googlemail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Feb 18, 2010
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: add KEY_RFKILL
      Input: i8042 - fix KBC jam during hibernate
  3. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Feb 18, 2010
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: fix "acpi=ht" boot option
      ACPI, i915: blacklist Clevo M5x0N bad_lid state
      ACPI: fix High cpu temperature with 2.6.32
      ACPI: dock: properly initialize local struct dock_station in dock_add()
      ACPI: remove Asus P2B-DS from acpi=ht blacklist
      thinkpad-acpi: wrong thermal attribute_group removed in thermal_exit()
      ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
      ACPI: Add NULL pointer check in acpi_bus_start
      ACPI: processor: only evaluate _PDC once per processor
      ACPI: processor: add kernel command line support for early _PDC eval
  4. Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Feb 18, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: fix bo's fence association
      drm/radeon/kms: fix indirect buffer management V2
      drm/edid: Fix interlaced detailed timings to be frame size, not field.
      drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
      drm/radeon/kms: use udelay for short delays
      drm/nouveau: Force TV encoder DPMS reinit after resume.
      drm/nouveau: use mutex for vbios lock
  5. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Feb 18, 2010
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
      powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards
  6. Input: add KEY_RFKILL

    Matthew Garrett committed with dtor Feb 17, 2010
    Most laptops have keys that are intended to toggle all device state, not
    just wifi. These are currently generally mapped to KEY_WLAN. As a result,
    rfkill will only kill or enable wifi in response to the key press. This
    confuses users and can make it difficult for them to enable bluetooth
    and wwan devices.
    
    This patch adds a new keycode, KEY_RFKILL. It indicates that the system
    should toggle the state of all rfkillable devices.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  7. Input: i8042 - fix KBC jam during hibernate

    Alan Jenkins committed with dtor Feb 17, 2010
    633aae2 "Input: i8042 - switch to using dev_pm_ops" removed handling
    for PMSG_THAW, since we do not need to do anything during freeze and
    thus it was thougt that thaw is not needed as well. However, there is
    a period when interrupts are kept off, and if key happens to be pressed
    during that time KBC becomes jammed. To avoid the jam we simply need
    to poll KBC once during thaw.
    
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  8. Merge branches 'bugzilla-14886', 'bugzilla-15000', 'bugzilla-15040', …

    lenb committed Feb 18, 2010
    …'bugzilla-15108', 'pdc', 'hotplug-null-ref' and 'thinkpad' into release
  9. ACPI: fix "acpi=ht" boot option

    lenb committed Feb 16, 2010
    We broke "acpi=ht" in 2.6.32 by disabling MADT parsing
    for acpi=disabled.  e5b8fc6
    This also broke systems which invoked acpi=ht via DMI blacklist.
    
    acpi=ht is a really ugly hack,
    but restore it for those that still use it.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=14886
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  10. Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/l…

    Dave Airlie committed Feb 18, 2010
    …inux-2.6 into drm-linus
    
    * 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6:
      drm/nouveau: Force TV encoder DPMS reinit after resume.
      drm/nouveau: use mutex for vbios lock
  11. drm/radeon/kms: fix bo's fence association

    Jerome Glisse committed with Dave Airlie Feb 15, 2010
    Previous code did associate fence to bo before the fence was emited
    and it also didn't lock protected access to ttm sync_obj member.
    Both of this flaw leads to possible race between different code
    path. This patch fix this by associating fence only once the fence
    is emitted and properly lock protect access to sync_obj member of
    ttm.
    
    Fix:
    https://bugs.freedesktop.org/show_bug.cgi?id=26438
    and likely similar others bugs
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. drm/radeon/kms: fix indirect buffer management V2

    Jerome Glisse committed with Dave Airlie Feb 15, 2010
    There is 3 different distinct states for an indirect buffer (IB) :
      1- free with no fence
      2- free with a fence
      3- non free (fence doesn't matter)
    Previous code mixed case 2 & 3 in a single one leading to possible
    catastrophique failure. This patch rework the handling and properly
    separate each case. So when you get ib we set the ib as non free and
    fence status doesn't matter. Fence become active (ie has a meaning
    for the ib code) once the ib is scheduled or free. This patch also
    get rid of the alloc bitmap as it was overkill, we know go through
    IB pool list like in a ring buffer as the oldest IB is the first
    one the will be free.
    
    Fix :
    https://bugs.freedesktop.org/show_bug.cgi?id=26438
    and likely other bugs.
    
    V2 remove the scheduled list, it's useless now, fix free ib scanning
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. drm/edid: Fix interlaced detailed timings to be frame size, not field.

    nwnk committed with Dave Airlie Feb 15, 2010
    cf. https://bugzilla.redhat.com/show_bug.cgi?id=533561
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  14. drm/vmwgfx: Use fb handover mechanism instead of stealth mode.

    thomashvmw committed with Dave Airlie Feb 15, 2010
    When the vmwgfx module is loaded on top of vesafb, it would operate in
    stealth mode in parallel with vesafb, evicting VRAM on dropmaster.
    
    Change that to use the vesafb handover mechanism, like other drmfb drivers.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  15. drm/radeon/kms: use udelay for short delays

    Dave Airlie committed Jan 30, 2010
    For usec delays use udelay instead of scheduling, this should
    allow reclocking to happen faster. This also was the cause
    of reported 33s delays at bootup on certain systems.
    
    fixes: freedesktop.org bug 25506
    
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  16. sparc: Fix incorrect comparison in of_bus_ambapp_match()

    Kristoffer Glembo committed with davem330 Feb 15, 2010
    Use type instead of name in comparison.
    
    Signed-off-by: Kristoffer Glembo <kristoffer@gaisler.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.

    davem330 committed Feb 18, 2010
    Mirrors powerpc commits bb209c8
    ("powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()")
    and 26b4a0c
    ("powerpc/pci: Add missing hookup to pci_slot")
    
    We also need to initialize ->dma_mask explicitly here too.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>