Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.38-rc8
Commits on Mar 8, 2011
  1. @torvalds

    Linux 2.6.38-rc8

    torvalds authored
  2. @torvalds

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

    torvalds authored
    …nux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: S3C64XX: Update regulator names for debugfs compatiblity on SMDK6410
      ARM: S3C64XX: Fix build with WM1190 disabled and WM1192 enabled on SMDK6410
      ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()
      ARM: S3C64XX: Tone down SDHCI debugging
      ARM: S3C64XX: Add clock for i2c1
      ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
      ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
      ARM: S3C64XX: Fix keypad setup to configure correct number of rows
      ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02
      ARM: S5P64X0: Fix number of GPIO lines in Bank F
      ARM: S3C2440: Select missing S3C_DEV_USB_HOST on GTA02
  3. @torvalds

    Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      davinci: cpufreq: fix section mismatch warning
      DaVinci: fix compilation warnings in <mach/clkdev.h>
      davinci: tnetv107x: fix register indexing for GPIOs numbers > 31
      davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio
      ARM: pxa/tosa: register wm9712 codec device
      ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform
      ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
      ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now
      ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
      ARM: 6761/1: Update number of VIC for S5PV210
      ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores
      ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request
      ARM: 6765/1: remove obsolete comment from asm/mach/arch.h
      ARM: 6757/1: fix tlb.h induced linux/swap.h build failure
  4. @torvalds

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

    torvalds authored
    …/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdio: Allow sdio operations in other threads during sdio_add_func()
  5. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: index i shadowed in 2nd loop
      drm/nv50-nvc0: prevent multiple vm/bar flushes occuring simultanenously
      drm/nouveau: fix regression causing ttm to not be able to evict vram
      drm/i915: Rebind the buffer if its alignment constraints changes with tiling
      drm/i915: Disable GPU semaphores by default
      drm/i915: Do not overflow the MMADDR write FIFO
      Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
Commits on Mar 7, 2011
  1. @RoelKluin

    drm: index i shadowed in 2nd loop

    RoelKluin authored Dave Airlie committed
    Index i was already used in thhe first loop
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. @cjb

    mmc: sdio: Allow sdio operations in other threads during sdio_add_func()

    Dmitry Shmidt authored cjb committed
    This fixes a bug introduced by 807e8e4 ("mmc: Fix sd/sdio/mmc
    initialization frequency retries") that prevented SDIO drivers from
    performing SDIO commands in their probe routines -- the above patch
    called mmc_claim_host() before sdio_add_func(), which causes a deadlock
    if an external SDIO driver calls sdio_claim_host().
    
    Fix tested on an OLPC XO-1.75 with libertas on SDIO.
    
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
    Reviewed-and-Tested-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Chris Ball <cjb@laptop.org>
  3. Merge remote branch 'ickle/drm-intel-fixes' into drm-fixes

    Dave Airlie authored
    * ickle/drm-intel-fixes:
      drm/i915: Rebind the buffer if its alignment constraints changes with tiling
      drm/i915: Disable GPU semaphores by default
      drm/i915: Do not overflow the MMADDR write FIFO
      Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
  4. @torvalds

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

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      omap: mailbox: resolve hang issue
      OMAP2+: PM: SmartReflex: fix memory leaks in Smartreflex driver
      arm: mach-omap2: smartreflex: fix another memory leak
  5. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] tape: deadlock on system work queue
      [S390] keyboard: integer underflow bug
      [S390] xpram: remove __initdata attribute from module parameters
  6. drm/nv50-nvc0: prevent multiple vm/bar flushes occuring simultanenously

    Ben Skeggs authored Dave Airlie committed
    The per-vm mutex doesn't prevent this completely, a flush coming from the
    BAR VM could potentially happen at the same time as one for the channel
    VM.  Not to mention that if/when we get per-client/channel VM, this will
    happen far more frequently.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. drm/nouveau: fix regression causing ttm to not be able to evict vram

    Ben Skeggs authored Dave Airlie committed
    TTM assumes an error condition from man->func->get_node() means that
    something went horribly wrong, and causes it to bail.
    
    The driver is supposed to return 0, and leave mm_node == NULL to
    signal that it couldn't allocate any memory.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  8. @ickle

    drm/i915: Rebind the buffer if its alignment constraints changes with…

    ickle authored
    … tiling
    
    Early gen3 and gen2 chipset do not have the relaxed per-surface tiling
    constraints of the later chipsets, so we need to check that the GTT
    alignment is correct for the new tiling. If it is not, we need to
    rebind.
    
    Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  9. @ickle

    drm/i915: Disable GPU semaphores by default

    ickle authored
    Andi Kleen narrowed his GPU hangs on his Sugar Bay (SNB desktop) rev 09
    down to the use of GPU semaphores, and we already know that they appear
    broken up to Huron River (mobile) rev 08. (I'm optimistic that disabling
    GPU semaphores is simply hiding another bug by the latency and
    side-effects of the additional device interaction it introduces...)
    
    However, use of semaphores is a massive performance improvement... Only
    as long as the system remains stable. Enable at your peril.
    
    Reported-by: Andi Kleen <andi-fd@firstfloor.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33921
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Commits on Mar 6, 2011
  1. @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 - Don't set to D3 in Cirrus errata init verbs
      ALSA: hda - add new Fermi 5xx codec IDs to snd-hda
      ASoC: WM8994: Ensure late enable events are processed for the ADCs
      ASoC: WM8994: Don't disable the AIF[1|2]CLK_ENA unconditionaly
      ASoC: Fix WM9081 platform data initialisation
      ALSA: hda - Fix unable to record issue on ASUS N82JV
      ALSA: HDA: Realtek: Fixup jack detection to input subsystem
  2. @torvalds

    virtio: console: Don't access vqs if device was unplugged

    Amit Shah authored torvalds committed
    If a virtio-console device gets unplugged while a port is open, a
    subsequent close() call on the port accesses vqs to free up buffers.
    This can lead to a crash.
    
    The buffers are already freed up as a result of the call to
    unplug_ports() from virtcons_remove().  The fix is to simply not access
    vq information if port->portdev is NULL.
    
    Reported-by: juzhang <juzhang@redhat.com>
    CC: stable@kernel.org
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @tiwai
  4. @ickle

    drm/i915: Do not overflow the MMADDR write FIFO

    ickle authored
    Whilst the GT is powered down (rc6), writes to MMADDR are placed in a
    FIFO by the System Agent. This is a limited resource, only 64 entries, of
    which 20 are reserved for Display and PCH writes, and so we must take
    care not to queue up too many writes. To avoid this, there is counter
    which we can poll to ensure there are sufficient free entries in the
    fifo.
    
    "Issuing a write to a full FIFO is not supported; at worst it could
    result in corruption or a system hang."
    
    Reported-and-Tested-by: Matt Turner <mattst88@gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34056
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  5. @ickle

    Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"

    ickle authored
    This reverts commit c2e0eb1.
    
    As it turns out, userspace already depends upon being able to enable
    tiling on existing bo which it promises to be large enough for its
    purposes i.e. it will not access beyond the end of the last full-tile
    row.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35016
    Reported-and-tested-by: Kamal Mostafa <kamal@canonical.com>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Commits on Mar 5, 2011
  1. @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:
      ceph: no .snap inside of snapped namespace
      libceph: fix msgr standby handling
      libceph: fix msgr keepalive flag
      libceph: fix msgr backoff
      libceph: retry after authorization failure
      libceph: fix handling of short returns from get_user_pages
      ceph: do not clear I_COMPLETE from d_release
      ceph: do not set I_COMPLETE
      Revert "ceph: keep reference to parent inode on ceph_dentry"
  2. @torvalds

    mm: use correct numa policy node for transparent hugepages

    Andi Kleen authored torvalds committed
    Pass down the correct node for a transparent hugepage allocation.  Most
    callers continue to use the current node, however the hugepaged daemon
    now uses the previous node of the first to be collapsed page instead.
    This ensures that khugepaged does not mess up local memory for an
    existing process which uses local policy.
    
    The choice of node is somewhat primitive currently: it just uses the
    node of the first page in the pmd range.  An alternative would be to
    look at multiple pages and use the most popular node.  I used the
    simplest variant for now which should work well enough for the case of
    all pages being on the same node.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    mm: preserve original node for transparent huge page copies

    Andi Kleen authored torvalds committed
    This makes a difference for LOCAL policy, where the node cannot be
    determined from the policy itself, but has to be gotten from the original
    page.
    
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    mm: add alloc_page_vma_node()

    Andi Kleen authored torvalds committed
    Add a alloc_page_vma_node that allows passing the "local" node in.  Used
    in a followon patch.
    
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    mm: change alloc_pages_vma to pass down the policy node for local policy

    Andi Kleen authored torvalds committed
    Currently alloc_pages_vma() always uses the local node as policy node for
    the LOCAL policy.  Pass this node down as an argument instead.
    
    No behaviour change from this patch, but will be needed for followons.
    
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @abou9 @torvalds

    RapidIO: Update MAINTAINERS

    abou9 authored torvalds committed
    Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
    Cc: Matt Porter <mporter@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @AxelLin @torvalds

    drivers/video/backlight/ltv350qv.c: fix a memory leak

    AxelLin authored torvalds committed
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    MAINTAINERS: add maintainer of Samsung Mobile Machine support

    Kyungmin Park authored torvalds committed
    Add maintainer of Samsung Mobile machine support.  Currently, Aquila,
    Goni, Universal (C210), and Nuri board are supported.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: Joe Perches <joe@perches.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    pps: make pps_gen_parport depend on BROKEN

    Thomas Gleixner authored torvalds committed
    This driver causes hard lockups, when the active clock soure is jiffies.
    
    The reason is that it loops with interrupts disabled waiting for a
    timestamp to be reached by polling getnstimeofday().  Though with a
    jiffies clocksource, when that code runs on the same CPU which is
    responsible for updating jiffies, then we loop in circles for ever
    simply because the timer interrupt cannot update jiffies.  So both UP
    and SMP can be affected.
    
    There is no easy fix for that problem so make it depend on BROKEN for
    now.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Alexander Gordeev <lasaine@lvk.cs.msu.su>
    Cc: Rodolfo Giometti <giometti@linux.it>
    Cc: john stultz <johnstul@us.ibm.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @AxelLin @torvalds

    drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE

    AxelLin authored torvalds committed
    The device table is required to load modules based on modaliases.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Cc: Shubhrajyoti D <shubhrajyoti@ti.com>
    Cc: Christoph Mair <christoph.mair@gmail.com>
    Cc: Jonathan Cameron <jic23@cam.ac.uk>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    cpuset: add a missing unlock in cpuset_write_resmask()

    Li Zefan authored torvalds committed
    Don't forget to release cgroup_mutex if alloc_trial_cpuset() fails.
    
    [akpm@linux-foundation.org: avoid multiple return points]
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Cc: Miao Xie <miaox@cn.fujitsu.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @AxelLin @torvalds

    drivers/rtc/rtc-s3c.c: fix prototype for s3c_rtc_setaie()

    AxelLin authored torvalds committed
    Fix s3c_rtc_setaie() prototype to eliminate the following compile
    warning:
    
      drivers/rtc/rtc-s3c.c:383: warning: initialization from incompatible pointer type
    
    (akpm: the rtc_class_ops.alarm_irq_enable() handler is being passed two
    arguments where it expects just one, presumably with undesired effects)
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

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

    torvalds authored
    …/git/vapier/blackfin
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
      Blackfin: iflush: update anomaly 05000491 workaround
      Blackfin: outs[lwb]: make sure count is greater than 0
  14. @torvalds

    Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/lethal/sh-2.6
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      ARM: mach-shmobile: mackerel: modify LCDC clock divider value
      ARM: mach-shmobile: ap4evb: modify LCDC clock divider value
      ARM: mach-shmobile: mackerel: fixup memory initialize for zboot
      ARM: mach-shmobile: ap4evb: fixup memory initialize for zboot
      ARM: mach-shmobile: Add sh73a0 MIPI-CSI and CEU clocks
      ARM: mach-shmobile: AG5EVM MIPI-DSI LCD reset delay fix
  15. @torvalds

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

    torvalds authored
    …ux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Change __nosave_XXX symbols to long
      sh: Flush executable pages in copy_user_highpage
      sh: Ensure ST40-300 BogoMIPS value is consistent
      sh: sh7750: Fix incompatible pointer type
      sh: sh7750: move machtypes.h to include/generated
  16. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/nouveau: allocate kernel's notifier object at end of block
Something went wrong with that request. Please try again.