Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 4, 2011
  1. Linux 2.6.39-rc6

    authored
  2. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: fix gart setup on fusion parts (v2)
      drm: Send pending vblank events before disabling vblank.
      drm/radeon: fix regression on atom cards with hardcoded EDID record.
      drm/radeon/kms: add some new pci ids
  3. drm/radeon/kms: fix gart setup on fusion parts (v2)

    Alex Deucher authored Dave Airlie committed
    Out of the entire GART/VM subsystem, the hw designers changed
    the location of 3 regs.
    
    v2: airlied: add parameter for userspace to work from.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  4. @RAOF

    drm: Send pending vblank events before disabling vblank.

    RAOF authored Dave Airlie committed
    This is the least-bad behaviour.  It means that we signal the
    vblank event before it actually happens, but since we're disabling
    vblanks there's no guarantee that it will *ever* happen otherwise.
    
    This prevents GL applications which use WaitMSC from hanging
    indefinitely.
    
    Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on May 3, 2011
  1. drm/radeon: fix regression on atom cards with hardcoded EDID record.

    Dave Airlie authored
    Since fafcf94 introduced an edid size, it seems to have broken this path.
    
    This manifest as oops on T500 Lenovo laptops with dual graphics primarily.
    
    Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33812
    
    cc: stable@kernel.org
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. drm/radeon/kms: add some new pci ids

    Alex Deucher authored Dave Airlie committed
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  3. logfs: initialize superblock entries earlier

    authored
    In particular, s_freeing_list needs to be initialized early, since it is
    used on some of the error paths when mounts fail.  The mapping inode,
    for example, would be initialized and then free'd on an error path
    before s_freeing_list was initialized, but the inode drop operation
    needs the s_freeing_list to be set up.
    
    Normally you'd never see this, because not only is logfs fairly rare,
    but a successful mount will never have any issues.
    
    Reported-by: werner <w.landgraf@ru.ru>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge branch 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/s…

    authored
    …cm/linux/kernel/git/konrad/xen
    
    * 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: mask_rw_pte mark RO all pagetable pages up to pgt_buf_top
      xen/mmu: Add workaround "x86-64, mm: Put early page table high"
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finish
      mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finish
      mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
      mmc: fix a race between card-detect rescan and clock-gate work instances
      mmc: omap: Fix possible NULL pointer deref
      mmc: core: mmc_add_card(): fix missing break in switch statement
      mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
  6. Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of git…

    authored
    …://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, reboot: Fix relocations in reboot_32.S
      x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
      x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: wm831x-ts - move BTN_TOUCH reporting to data transfer
      Input: wm831x-ts - allow IRQ flags to be specified
      Input: wm831x-ts - fix races with IRQ management
  8. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
      sysctl: net: call unregister_net_sysctl_table where needed
      Revert: veth: remove unneeded ifname code from veth_newlink()
      smsc95xx: fix reset check
      tg3: Fix failure to enable WoL by default when possible
      networking: inappropriate ioctl operation should return ENOTTY
      amd8111e: trivial typo spelling: Negotitate -> Negotiate
      ipv4: don't spam dmesg with "Using LC-trie" messages
      af_unix: Only allow recv on connected seqpacket sockets.
      mii: add support of pause frames in mii_get_an
      net: ftmac100: fix scheduling while atomic during PHY link status change
      usbnet: Transfer of maintainership
      usbnet: add support for some Huawei modems with cdc-ether ports
      bnx2: cancel timer on device removal
      iwl4965: fix "Received BA when not expected"
      iwlagn: fix "Received BA when not expected"
      dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085
      usbnet: Resubmit interrupt URB if device is open
      iwl4965: fix "TX Power requested while scanning"
      iwlegacy: led stay solid on when no traffic
      b43: trivial: update module info about ucode16_mimo firmware
      ...
Commits on May 2, 2011
  1. @luciang @davem330

    sysctl: net: call unregister_net_sysctl_table where needed

    luciang authored davem330 committed
    ctl_table_headers registered with register_net_sysctl_table should
    have been unregistered with the equivalent unregister_net_sysctl_table
    
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    Revert: veth: remove unneeded ifname code from veth_newlink()

    Jiri Pirko authored davem330 committed
    84c49d8 ("veth: remove unneeded
    ifname code from veth_newlink()") caused regression on veth
    creation. This patch reverts the original one.
    
    Reported-by: Michał Mirosław <mirqus@gmail.com>
    Signed-off-by: Jiri Pirko <jpirko@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @rabinv @davem330

    smsc95xx: fix reset check

    rabinv authored davem330 committed
    The reset loop check should check the MII_BMCR register value for
    BMCR_RESET rather than for MII_BMCR (the register address, which also
    happens to be zero).
    
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @rjwysocki @davem330

    tg3: Fix failure to enable WoL by default when possible

    rjwysocki authored davem330 committed
    tg3 is supposed to enable WoL by default on adapters which support
    that, but it fails to do so unless the adapter's
    /sys/devices/.../power/wakeup file contains 'enabled' during the
    initialization of the adapter.  Fix that by making tg3 use
    device_set_wakeup_enable() to enable wakeup automatically whenever
    WoL should be enabled by default.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @lifengsun @davem330

    networking: inappropriate ioctl operation should return ENOTTY

    lifengsun authored davem330 committed
    ioctl() calls against a socket with an inappropriate ioctl operation
    are incorrectly returning EINVAL rather than ENOTTY:
    
      [ENOTTY]
          Inappropriate I/O control operation.
    
    BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=33992
    
    Signed-off-by: Lifeng Sun <lifongsun@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. x86, reboot: Fix relocations in reboot_32.S

    H. Peter Anvin authored
    The use of base for %ebx in this file is arbitrary, *except* that we
    also use it to compute the real-mode segment.  Therefore, make it so
    that r_base really is the true address to which %ebx points.
    
    This resolves kernel bugzilla 33302.
    
    Reported-and-tested-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Link: http://lkml.kernel.org/n/tip-08os5wi3yq1no0y4i5m4z7he@git.kernel.org
  7. @davem330

    amd8111e: trivial typo spelling: Negotitate -> Negotiate

    Joe Perches authored davem330 committed
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @sstabellini

    xen: mask_rw_pte mark RO all pagetable pages up to pgt_buf_top

    sstabellini authored Konrad Rzeszutek Wilk committed
    mask_rw_pte is currently checking if a pfn is a pagetable page if it
    falls in the range pgt_buf_start - pgt_buf_end but that is incorrect
    because pgt_buf_end is a moving target: pgt_buf_top is the real
    boundary.
    
    Acked-by: "H. Peter Anvin" <hpa@zytor.com>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  9. xen/mmu: Add workaround "x86-64, mm: Put early page table high"

    Konrad Rzeszutek Wilk authored
    As a consequence of the commit:
    
    commit 4b239f4
    Author: Yinghai Lu <yinghai@kernel.org>
    Date:   Fri Dec 17 16:58:28 2010 -0800
    
        x86-64, mm: Put early page table high
    
    it causes the Linux kernel to crash under Xen:
    
    mapping kernel into physical memory
    Xen: setup ISA identity maps
    about to get started...
    (XEN) mm.c:2466:d0 Bad type (saw 7400000000000001 != exp 1000000000000000) for mfn b1d89 (pfn bacf7)
    (XEN) mm.c:3027:d0 Error while pinning mfn b1d89
    (XEN) traps.c:481:d0 Unhandled invalid opcode fault/trap [#6] on VCPU 0 [ec=0000]
    (XEN) domain_crash_sync called from entry.S
    (XEN) Domain 0 (vcpu#0) crashed on cpu#0:
    ...
    
    The reason is that at some point init_memory_mapping is going to reach
    the pagetable pages area and map those pages too (mapping them as normal
    memory that falls in the range of addresses passed to init_memory_mapping
    as argument). Some of those pages are already pagetable pages (they are
    in the range pgt_buf_start-pgt_buf_end) therefore they are going to be
    mapped RO and everything is fine.
    Some of these pages are not pagetable pages yet (they fall in the range
    pgt_buf_end-pgt_buf_top; for example the page at pgt_buf_end) so they
    are going to be mapped RW.  When these pages become pagetable pages and
    are hooked into the pagetable, xen will find that the guest has already
    a RW mapping of them somewhere and fail the operation.
    The reason Xen requires pagetables to be RO is that the hypervisor needs
    to verify that the pagetables are valid before using them. The validation
    operations are called "pinning" (more details in arch/x86/xen/mmu.c).
    
    In order to fix the issue we mark all the pages in the entire range
    pgt_buf_start-pgt_buf_top as RO, however when the pagetable allocation
    is completed only the range pgt_buf_start-pgt_buf_end is reserved by
    init_memory_mapping. Hence the kernel is going to crash as soon as one
    of the pages in the range pgt_buf_end-pgt_buf_top is reused (b/c those
    ranges are RO).
    
    For this reason, this function is introduced which is called _after_
    the init_memory_mapping has completed (in a perfect world we would
    call this function from init_memory_mapping, but lets ignore that).
    
    Because we are called _after_ init_memory_mapping the pgt_buf_[start,
    end,top] have all changed to new values (b/c another init_memory_mapping
    is called). Hence, the first time we enter this function, we save
    away the pgt_buf_start value and update the pgt_buf_[end,top].
    
    When we detect that the "old" pgt_buf_start through pgt_buf_end
    PFNs have been reserved (so memblock_x86_reserve_range has been called),
    we immediately set out to RW the "old" pgt_buf_end through pgt_buf_top.
    
    And then we update those "old" pgt_buf_[end|top] with the new ones
    so that we can redo this on the next pagetable.
    
    Acked-by: "H. Peter Anvin" <hpa@zytor.com>
    Reviewed-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    [v1: Updated with Jeremy's comments]
    [v2: Added the crash output]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  10. @davem330
  11. Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6

    authored
    * 'for-linus' of git://git.infradead.org/ubifs-2.6:
      UBIFS: seek journal heads to the latest bud in replay
      UBIFS: do not free write-buffers when in R/O mode
  12. Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    authored
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: (47 commits)
      CLKDEV: Fix clkdev return value for NULL clk case
      ARM: 6891/1: prevent heap corruption in OABI semtimedop
      ARM: kprobes: Tidy-up kprobes-decode.c
      ARM: kprobes: Add emulation of hint instructions like NOP and WFI
      ARM: kprobes: Add emulation of SBFX, UBFX, BFI and BFC instructions
      ARM: kprobes: Add emulation of MOVW and MOVT instructions
      ARM: kprobes: Reject probing of undefined data processing instructions
      ARM: kprobes: Remove redundant code in space_1111
      ARM: kprobes: Fix emulation of PLD instructions
      ARM: kprobes: Reject probing of SETEND instructions
      ARM: kprobes: Consolidate stub decoding functions
      ARM: kprobes: Reject probing of all coprocessor instructions
      ARM: kprobes: Fix emulation of USAD8 instructions
      ARM: kprobes: Fix emulation of SMUAD, SMUSD and SMMUL instructions
      ARM: kprobes: Fix emulation of SXTB16, SXTB, SXTH, UXTB16, UXTB and UXTH instructions
      ARM: kprobes: Reject probing of undefined media instructions
      ARM: kprobes: Add emulation of RBIT instruction
      ARM: kprobes: Reject probing of LDRB instructions which load PC
      ARM: kprobes: Fix emulation of LDRD and STRD instructions
      ARM: kprobes: Reject probing of LDR/STR instructions which update PC unpredictably
      ...
  13. @geertu

    genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL

    geertu authored Thomas Gleixner committed
    commit ab7798f ("genirq: Expand generic
    show_interrupts()") added the Kconfig option GENERIC_IRQ_SHOW_LEVEL to
    accomodate PowerPC, but this doesn't actually enable the functionality due
    to a typo in the #ifdef check.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Linux/PPC Development <linuxppc-dev@lists.ozlabs.org>
    Link: http://lkml.kernel.org/r/%3Calpine.DEB.2.00.1104302251370.19068%40ayla.of.borg%3E
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  14. UBIFS: seek journal heads to the latest bud in replay

    Artem Bityutskiy authored
    This is the second fix of the following symptom:
    
    UBIFS error (pid 34456): could not find an empty LEB
    
    which sometimes happens after power cuts when we mount the file-system - UBIFS
    refuses it with the above error message which comes from the
    'ubifs_rcvry_gc_commit()' function. I can reproduce this using the integck test
    with the UBIFS power cut emulation enabled.
    
    Analysis of the problem.
    
    Currently UBIFS replay seeks the journal heads to the last _replayed_ bud.
    But the buds are replayed out-of-order, so the replay basically seeks journal
    heads to the "random" bud belonging to this head, and not to the _last_ one.
    
    The result of this is that the GC head may be seeked to a full LEB with no free
    space, or very little free space. And 'ubifs_rcvry_gc_commit()' tries to find a
    fully or mostly dirty LEB to match the current GC head (because we need to
    garbage-collect that dirty LEB at one go, because we do not have @c->gc_lnum).
    So 'ubifs_find_dirty_leb()' fails and we fall back to finding an empty LEB and
    also fail. As a result - recovery fails and mounting fails.
    
    This patch teaches the replay to initialize the GC heads exactly to the latest
    buds, i.e. the buds which have the largest sequence number in corresponding
    log reference nodes.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Cc: stable@kernel.org
  15. UBIFS: do not free write-buffers when in R/O mode

    Artem Bityutskiy authored
    Currently UBIFS has a small optimization - it frees write-buffers when it is
    re-mounted from R/W mode to R/O mode. Of course, when it is mounted R/O, it
    does not allocate write-buffers as well.
    
    This optimization is nice but it leads to subtle problems and complications
    in recovery, which I can reproduce using the integck test. The symptoms are
    that after a power cut the file-system cannot be mounted if we first mount
    it R/O, and then re-mount R/W - 'ubifs_rcvry_gc_commit()' prints:
    
    UBIFS error (pid 34456): could not find an empty LEB
    
    Analysis of the  problem.
    
    When mounting R/W, the reply process sets journal heads to buds [1], but
    when mounting R/O - it does not do this, because the write-buffers are not
    allocated. So 'ubifs_rcvry_gc_commit()' works completely differently for the
    same file-system but for the following 2 cases:
    
    1. mounting R/W after a power cut and recover
    2. mounting R/O after a power cut, re-mounting R/W and run deferred recovery
    
    In the former case, we have journal heads seeked to the a bud, in the latter
    case, they are non-seeked (wbuf->lnum == -1). So in the latter case we do not
    try to recover the GC LEB by garbage-collecting to the GC head, but we just
    try to find an empty LEB, and there may be no empty LEBs, so we just fail.
    On the other hand, in the former case (mount R/W), we are able to make a GC LEB
    (@c->gc_lnum) by garbage-collecting.
    
    Thus, let's remove this small nice optimization and always allocate
    write-buffers. This should not make too big difference - we have only 3
    of them, each of max. write unit size, which is usually 2KiB. So this is
    about 6KiB of RAM for the typical case, and only when mounted R/O.
    
    [1]: Note, currently the replay process is setting (seeking) the journal heads
    to _some_ buds, not necessarily to the buds which had been the journal heads
    before the power cut happened. This will be fixed separately.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Cc: stable@kernel.org
  16. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix Realtek's chained fixup checks
      Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"
      ALSA: HDA: Fix automute for Gateway NV79
      ALSA: hda: add beep quirk for Realtek 0x1043:831a
      ALSA: usb-audio - Terratec Aureon 7.1 USB ID as C-Media cm6206 quirks
      ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.
      ALSA - au88x0 - Add buffer bytes constraints
  17. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] irqstats: fix counting of pfault, dasd diag and virtio irqs
      [S390] prng: fix pointer arithmetic
  18. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    authored
    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails
  19. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c-parport: Fix adapter list handling
      i2c-i801: Move device ID definitions to driver
  20. XZ decompressor: Fix decoding of empty LZMA2 streams

    Lasse Collin authored committed
    The old code considered valid empty LZMA2 streams to be corrupt.
    Note that a typical empty .xz file has no LZMA2 data at all,
    and thus most .xz files having no uncompressed data are handled
    correctly even without this fix.
    
    Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @tiwai

    ALSA: hda - Fix Realtek's chained fixup checks

    tiwai authored
    The check of chained fixup list entry was done against the wrong element.
    A stupid mistake during refactoring.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  22. @tiwai

    Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"

    tiwai authored
    This reverts commit c6b3587.
    
    It turned out that there are different pin configurations for this
    PCI SSID, including multi-channel modes.  And more proper fix for
    allowing line-out mutes will come up in 2.6.40 tree, so we won't need
    this fixup any more there.
    
    Reported-by: Andrew Clayton <andrew@digital-domain.net>
    Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  23. @davem330

    ipv4: don't spam dmesg with "Using LC-trie" messages

    Alexey Dobriyan authored davem330 committed
    fib_trie_table() is called during netns creation and
    Chromium uses clone(CLONE_NEWNET) to sandbox renderer process.
    
    Don't print anything.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.