Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.34-rc4-gi…
Commits on Apr 17, 2010
  1. @torvalds

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

    torvalds authored
    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: Ignore LVDS EDID when it is unavailabe or invalid
      drm/i915: Add no_lvds entry for the Clientron U800
      drm/i915: Rename many remaining uses of "output" to encoder or connector.
      drm/i915: Rename intel_output to intel_encoder.
      agp/intel: intel_845_driver is an agp driver!
      drm/i915: introduce to_intel_bo helper
      drm/i915: Disable FBC on 915GM and 945GM.
  2. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: EC: Limit burst to 64 bits
  3. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    torvalds authored
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: don't warn on EAGAIN in inode reclaim
      xfs: ensure that sync updates the log tail correctly
Commits on Apr 16, 2010
  1. @lenb
  2. @lenb

    ACPI: EC: Limit burst to 64 bits

    Alexey Starikovskiy authored lenb committed
    access_bit_width field is u8 in ACPICA, thus 256 value written to it
    becomes 0, causing divide by zero later.
    
    Proper fix would be to remove access_bit_width at all, just because
    we already have access_byte_width, which is access_bit_width / 8.
    Limit access width to 64 bit for now.
    
    https://bugzilla.kernel.org/show_bug.cgi?id=15749
    fixes regression caused by the fix for:
    https://bugzilla.kernel.org/show_bug.cgi?id=14667
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
  3. xfs: don't warn on EAGAIN in inode reclaim

    Dave Chinner authored Alex Elder committed
    Any inode reclaim flush that returns EAGAIN will result in the inode
    reclaim being attempted again later. There is no need to issue a
    warning into the logs about this situation.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Alex Elder <aelder@sgi.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
  4. xfs: ensure that sync updates the log tail correctly

    Dave Chinner authored Alex Elder committed
    Updates to the VFS layer removed an extra ->sync_fs call into the
    filesystem during the sync process (from the quota code).
    Unfortunately the sync code was unknowingly relying on this call to
    make sure metadata buffers were flushed via a xfs_buftarg_flush()
    call to move the tail of the log forward in memory before the final
    transactions of the sync process were issued.
    
    As a result, the old code would write a very recent log tail value
    to the log by the end of the sync process, and so a subsequent crash
    would leave nothing for log recovery to do. Hence in qa test 182,
    log recovery only replayed a small handle for inode fsync
    transactions in this case.
    
    However, with the removal of the extra ->sync_fs call, the log tail
    was now not moved forward with the inode fsync transactions near the
    end of the sync procese the first (and only) buftarg flush occurred
    after these transactions went to disk. The result is that log
    recovery now sees a large number of transactions for metadata that
    is already on disk.
    
    This usually isn't a problem, but when the transactions include
    inode chunk allocation, the inode create transactions and all
    subsequent changes are replayed as we cannt rely on what is on disk
    is valid. As a result, if the inode was written and contains
    unlogged changes, the unlogged changes are lost, thereby violating
    sync semantics.
    
    The fix is to always issue a transaction after the buftarg flush
    occurs is the log iѕ not idle or covered. This results in a dummy
    transaction being written that contains the up-to-date log tail
    value, which will be very recent. Indeed, it will be at least as
    recent as the old code would have left on disk, so log recovery
    will behave exactly as it used to in this situation.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Alex Elder <aelder@sgi.com>
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] max63xx driver depends on ioremap()
      [WATCHDOG] max63xx: be careful when disabling the watchdog
      [WATCHDOG] fixed book E watchdog period register mask.
      [WATCHDOG] omap4: Fix WDT Kconfig
  6. @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:
      ASoC: imx-ssi: do not call hrtimer_disable in trigger function
      ALSA: hda - Add position_fix quirk for Biostar mobo
      ALSA: hda - add a quirk for Clevo M570U laptop
      ASoC: imx-ssi: increase minimum periods to 4
      ALSA: hda - Avoid invalid "Independent HP" control for VIA codecs
      ALSA: hda - Fix control element allocations in VIA codec parser
      ALSA: aaci - Fix alignment faults on ARM Cortex introduced by commit 29a4f2d
      ALSA: hda - Add fix-up for Sony VAIO with ALC269
      ALSA: hda - Enhance fix-up table for Realtek codecs
      ALSA: usb - Fix Oops after usb-midi disconnection
      ALSA: hda - Fix initial capture source connections of ALC880/260
      ALSA: hda - Fix setup for ALC269vb amic and dmic models
      ALSA: hda - Fix auto-parser of ALC269vb for HP pin NID 0x21
      ASoC: imx-ssi: Use a hrtimer in FIQ mode
      ASoC: imx-pcm-dma-mx2: restart DMA after an error
      ASoC: imx-ssi: honor IMX_SSI_DMA flag
      ASoC: wm2000: remove unused #include <linux/version.h>
      ALSA: hda: Add support for Medion WIM2160
  7. @geertu

    [WATCHDOG] max63xx driver depends on ioremap()

    geertu authored Wim Van Sebroeck committed
    Correct fix for the "ioremap() causes build failure on S390" should have been
    a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver
    in the ARM section for now).
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  8. [WATCHDOG] max63xx: be careful when disabling the watchdog

    Marc Zyngier authored Wim Van Sebroeck committed
    When shutting down the watchdog timer, special care must be taken
    not to overwrite other bits in the register, as it may be shared
    with other peripherals.
    
    For example, on the Arcom Vulcan, the register is shared between
    the watchdog and the PCI reset line...
    
    Signed-off-by: Marc Zyngier <maz@misterjones.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  9. [WATCHDOG] fixed book E watchdog period register mask.

    Luuk Paulussen authored Wim Van Sebroeck committed
    A previous fix changed the WDTP function to use the period directly,
    rather than subtracting from 63.  However the mask generation was
    not changed, so the mask was coming out as 0.  This patch fixes it.
    
    Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  10. @SantoshShilimkar

    [WATCHDOG] omap4: Fix WDT Kconfig

    SantoshShilimkar authored Wim Van Sebroeck committed
    This patch allows Watchdog timer to be selected for OMAP4 by fixing
    Kconfig entry
    
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  11. @tiwai
  12. @tiwai
  13. @tiwai
Commits on Apr 15, 2010
  1. @torvalds

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

    torvalds authored
    …nux/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/gart: Disable GART explicitly before initialization
      dma-debug: Cleanup for copy-loop in filter_write()
      x86/amd-iommu: Remove obsolete parameter documentation
      x86/amd-iommu: use for_each_pci_dev
      Revert "x86: disable IOMMUs on kernel crash"
      x86/amd-iommu: warn when issuing command to uninitialized cmd buffer
      x86/amd-iommu: enable iommu before attaching devices
      x86/amd-iommu: Use helper function to destroy domain
      x86/amd-iommu: Report errors in acpi parsing functions upstream
      x86/amd-iommu: Pt mode fix for domain_destroy
      x86/amd-iommu: Protect IOMMU-API map/unmap path
      x86/amd-iommu: Remove double NULL check in check_device
  2. @torvalds

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

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: cdev: change license of exported header files to MIT license
      firewire: cdev: comment fixlet
      firewire: cdev: iso packet documentation
      firewire: cdev: fix information leak
      firewire: cdev: require quadlet-aligned headers for transmit packets
      firewire: cdev: disallow receive packets without header
  3. @torvalds

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

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: wacom - switch mode upon system resume
      Revert "Input: wacom - merge out and in prox events"
      Input: matrix_keypad - allow platform to disable key autorepeat
      Input: ALPS - add signature for HP Pavilion dm3 laptops
      Input: i8042 - spelling fix
      Input: sparse-keymap - implement safer freeing of the keymap
      Input: update the status of the Multitouch X driver project
      Input: clarify the no-finger event in multitouch protocol
      Input: bcm5974 - retract efi-broken suspend_resume
      Input: sparse-keymap - free the right keymap on error
  4. @dtor

    Input: wacom - switch mode upon system resume

    Ping Cheng authored dtor committed
    When Wacom devices wake up from a sleep, the switch mode command
    (wacom_query_tablet_data) is needed before wacom_open is called.
    wacom_query_tablet_data should not be executed inside wacom_open
    since wacom_open is called more than once during probe.
    
    wacom_retrieve_hid_descriptor is removed from wacom_resume due
    to the fact that the required descriptors are stored properly
    upon system resume.
    
    Reported-and-tested-by: Anton Anikin <Anton@Anikin.name>
    Signed-off-by: Ping Cheng <pingc@wacom.com>
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  5. @broonie

    ASoC: imx-ssi: do not call hrtimer_disable in trigger function

    Sascha Hauer authored broonie committed
    Doing so causes a deadlock, so just signal the timer to stop
    using an atomic variable.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  6. firewire: cdev: change license of exported header files to MIT license

    Stefan Richter authored
    Among else, this allows projects like libdc1394 to carry copies of the
    ABI related header files without them or distributors having to worry
    about effects on the project's overall license terms.  Switch to MIT
    license as suggested by Kristian.  Also update the year in the
    copyright statement according to source history.
    
    Cc: Jay Fenlason <fenlason@redhat.com>
    Acked-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
  7. @tiwai

    ALSA: hda - Add position_fix quirk for Biostar mobo

    tiwai authored
    The Biostar mobo seems to give a wrong DMA position, resulting in
    stuttering or skipping sounds on 2.6.34.  Since the commit
    7b3a177, "ALSA: pcm_lib: fix "something
    must be really wrong" condition", makes the position check more strictly,
    the DMA position problem is revealed more clearly now.
    
    The fix is to use only LPIB for obtaining the position, i.e. passing
    position_fix=1.  This patch adds a static quirk to achieve it as default.
    
    Reported-by: Frank Griffin <ftg@roadrunner.com>
    Cc: Eric Piel <Eric.Piel@tremplin-utc.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  8. @tiwai

    ALSA: hda - add a quirk for Clevo M570U laptop

    Joerg Schirottke authored tiwai committed
    Added the matching model for Clevo laptop M570U.
    
    Signed-off-by: Joerg Schirottke <master@kanotix.com>
    Tested-by: Maximilian Gerhard <maxbox@directbox.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  9. @torvalds

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

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      SELinux: Reduce max avtab size to avoid page allocation failures
  10. @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: use separate class for ceph sockets' sk_lock
      ceph: reserve one more caps space when doing readdir
      ceph: queue_cap_snap should always queue dirty context
      ceph: fix dentry reference leak in dcache readdir
      ceph: decode v5 of osdmap (pool names) [protocol change]
      ceph: fix ack counter reset on connection reset
      ceph: fix leaked inode ref due to snap metadata writeback race
      ceph: fix snap context reference leaks
      ceph: allow writeback of snapped pages older than 'oldest' snapc
      ceph: fix dentry rehashing on virtual .snap dir
  11. @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: (applesmc) Switch maintainers
      hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support
      hwmon: (it87) Invalidate cache on temperature sensor change
      hwmon: (it87) Properly handle wrong sensor type requests
      hwmon: (it87) Don't arbitrarily enable temperature channels
      hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n
      hwmon: (sht15) Fix sht15_calc_temp interpolation function
  12. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds authored
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      lguest: stop using KVM hypercall mechanism
      lguest: workaround cmpxchg8b_emu by ignoring cli in the guest.
  13. @torvalds

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

    torvalds authored
    …/git/geert/linux-m68k
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()
      m68k: Fix `struct sigcontext' for ColdFire
  14. @broonie

    ASoC: imx-ssi: increase minimum periods to 4

    Sascha Hauer authored broonie committed
    Currently the notification of elapsed periods is not very exact.
    Increase minimum periods to 4 as suggested by Liam Girdwood.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Commits on Apr 14, 2010
  1. @stephensmalley

    SELinux: Reduce max avtab size to avoid page allocation failures

    stephensmalley authored James Morris committed
    Reduce MAX_AVTAB_HASH_BITS so that the avtab allocation is an order 2
    allocation rather than an order 4 allocation on x86_64.  This
    addresses reports of page allocation failures:
    http://marc.info/?l=selinux&m=126757230625867&w=2
    https://bugzilla.redhat.com/show_bug.cgi?id=570433
    
    Reported-by:  Russell Coker <russell@coker.com.au>
    Signed-off-by:  Stephen D. Smalley <sds@tycho.nsa.gov>
    Acked-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. @geertu

    m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_ne…

    geertu authored
    …gative()
    
    Recently, we started seeing this on allmodconfig builds:
    
      CC      mm/memcontrol.o
    {standard input}: Assembler messages:
    {standard input}:4076: Error: operands mismatch -- statement `subl 12(%fp),170(%a0)' ignored
    
    Correct the asm constraint, like done for m68knommu.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  3. @geertu

    m68k: Fix `struct sigcontext' for ColdFire

    Maxim Kuvyrkov authored geertu committed
    LibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext'
    and this patch avoids LibSegFault overflowing this field.  Also this
    removes an unnecessary divergence from classic m68k.
    
    Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  4. @JoePerches @torvalds

    vsprintf: Change struct printf_spec.precision from s8 to s16

    JoePerches authored torvalds committed
    Commit ef0658f changed precision
    from int to s8.
    
    There is existing kernel code that uses a larger precision.
    
    An example from the audit code:
    	vsnprintf(...,..., " msg='%.1024s'", (char *)data);
    which overflows precision and truncates to nothing.
    
    Extending precision size fixes the audit system issue.
    
    Other changes:
    
    Change the size of the struct printf_spec.type from u16 to u8 so
    sizeof(struct printf_spec) stays as small as possible.
    Reorder the struct members so sizeof(struct printf_spec) remains 64 bits
    without alignment holes.
    Document the struct members a bit more.
    
    Original-patch-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Joe Perches <joe@perches.com>
    Tested-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @rydberg

    hwmon: (applesmc) Switch maintainers

    rydberg authored Jean Delvare committed
    Nicolas has expressed a wish to be relieved from the maintenance
    of applesmc, so we simply switch maintainer with this patch.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Acked-by: Nicolas Boichat <nicolas@boichat.ch>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
Something went wrong with that request. Please try again.