Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.34-rc7-gi…
Commits on May 10, 2010
  1. @torvalds

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

    torvalds authored
    …it/tiwai/sound-2.6
    
    * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard"
      ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec
      ALSA: hda - fix DG45ID SPDIF output
  2. @raven-au @torvalds

    autofs4-2.6.34-rc1 - fix link_count usage

    raven-au authored torvalds committed
    After commit 1f36f77 ("Switch !O_CREAT case to use of do_last()") in
    2.6.34-rc1 autofs direct mounts stopped working.  This is caused by
    current->link_count being 0 when ->follow_link() is called from
    do_filp_open().
    
    I can't work out why this hasn't been seen before Als patch series.
    
    This patch removes the autofs dependence on current->link_count.
    
    Signed-off-by: Ian Kent <raven@themaw.net>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

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

    torvalds authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: fix suspend crash by moving initializations earlier
      HID: sony: fix sony_set_operational_bt
      HID: ntrig: Remove unused macro, TripleTap and QuadTap
      HID: ntrig: TipSwitch for single touch mode touch.
      HID: hidraw: fix numbered reports
      HID: wacom: remove annoying non-error printk
      HID: ntrig: Emit TOUCH with DOUBLETAP for single touch
      HID: add support for cymotion master solar keyboard
      HID: ntrig: explain firmware quirk
      HID: fix N-trig touch panel with recent firmware
  4. @pkgadd @tiwai

    ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard"

    pkgadd authored tiwai committed
    This reverts commit 7aee674.
    
    As it doesn't seem to be universally valid for all mainboard revisions of
    the D945GCLF2 and breaks snd-hda-intel/ snd-hda-codec-realtek on the Intel
    Corporation "D945GCLF2" (LF94510J.86A.0229.2009.0729.0209) mainboard.
    
    00:1b.0 Audio device [0403]: Intel Corporation N10/ICH 7 Family High Definition Audio Controller [8086:27d8] (rev 01)
    
    Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
    Cc: <stable@kernel.org> [2.6.33]
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  5. @nikel123 @tiwai

    ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec

    nikel123 authored tiwai committed
    Ideapad quirks working for my ThinkPad X100e (microphone is not tested).
    
    Signed-off-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  6. @torvalds

    Linux 2.6.34-rc7

    torvalds authored
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error
      [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error
      [SCSI] scsi_debug: virtual_gb ignores sector_size
      [SCSI] libiscsi: regression: fix header digest errors
      [SCSI] fix locking around blk_abort_request()
      [SCSI] advansys: fix narrow board error path
  8. @fenrus75 @torvalds

    cpuidle: Fix incorrect optimization

    fenrus75 authored torvalds committed
    commit 672917d ("cpuidle: menu governor: reduce latency on exit")
    added an optimization, where the analysis on the past idle period moved
    from the end of idle, to the beginning of the new idle.
    
    Unfortunately, this optimization had a bug where it zeroed one key
    variable for new use, that is needed for the analysis.  The fix is
    simple, zero the variable after doing the work from the previous idle.
    
    During the audit of the code that found this issue, another issue was
    also found; the ->measured_us data structure member is never set, a
    local variable is always used instead.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Corrado Zoccolo <czoccolo@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on May 7, 2010
  1. HID: fix suspend crash by moving initializations earlier

    Alan Stern authored Jiri Kosina committed
    Although the usbhid driver allocates its usbhid structure in the probe
    routine, several critical fields in that structure don't get
    initialized until usbhid_start().  However if report descriptor
    parsing fails then usbhid_start() is never called.  This leads to
    problems during system suspend -- the system will freeze.
    
    This patch (as1378) fixes the bug by moving the initialization
    statements up into usbhid_probe().
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Reported-by: Bruno Prémont <bonbons@linux-vserver.org>
    Tested-By: Bruno Prémont <bonbons@linux-vserver.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  2. @torvalds

    Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds authored
    * 'for-linus' of git://neil.brown.name/md:
      md: restore ability of spare drives to spin down.
      md/raid6: Fix raid-6 read-error correction in degraded state
  3. @torvalds

    Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: fix compilation after 16bit state locking changes
      pcmcia: order userspace suspend and resume requests
      pcmcia: avoid pccard_validate_cis failure in resume callpath
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      blk-cgroup: Fix an RCU warning in blkiocg_create()
      blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
      drbd: don't expose failed local READ to upper layers
  5. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/ttm: Remove the ttm_bo_block_reservation() function.
      drm/ttm: Remove some leftover debug messages.
      drm/radeon: async event synchronization for drmWaitVblank
  6. @stintel @torvalds

    virtio: initialize earlier

    stintel authored torvalds committed
    Move initialization of the virtio framework before the initialization of
    mtd, so that block2mtd can be used on virtio-based block devices.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15644
    
    Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: Fix RCU issues in the NFSv4 delegation code
      NFSv4: Fix the locking in nfs_inode_reclaim_delegation()
  8. @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: sleep: init_set_sci_en_on_resume for Dell Studio 155x
      ACPI: fix acpi_hest_firmware_first_pci() caused oops
      sbshc: acpi_device_class "smbus_host_controller" too long
      power_meter: acpi_device_class "power_meter_resource" too long
      acpi_pad: "processor_aggregator" name too long
      PNP: don't check for conflicts with bridge windows
      ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads
      PNPACPI: compute Address Space length rather than using _LEN
      ACPI: silence kmemcheck false positive
  9. @torvalds

    Merge branch 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/mchehab/linux-2.6
    
    * 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      V4L/DVB: pxa_camera: move fifo reset direct before dma start
      V4L/DVB: video: testing unsigned for less than 0
      V4L/DVB: mx1-camera: compile fix
      V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer 	dereference"
      V4L/DVB: ngene: Workaround for stuck DiSEqC pin
      V4L/DVB: saa7146: fix regression of the av7110/budget-av driver
      V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1
      V4L/DVB: feature-removal: announce videotext.h removal
      V4L/DVB: V4L - vpfe capture - fix for kernel crash
      V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver
      V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver
      V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration
      V4L/DVB: saa7146: fix up bytesperline if it is an impossible value
      V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails
      V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci
      V4L/DVB: omap24xxcam: potential buffer overflow
  10. @torvalds

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

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      rcu: create rcu_my_thread_group_empty() wrapper
      memcg: css_id() must be called under rcu_read_lock()
      cgroup: Check task_lock in task_subsys_state()
      sched: Fix an RCU warning in print_task()
      cgroup: Fix an RCU warning in alloc_css_id()
      cgroup: Fix an RCU warning in cgroup_path()
      KEYS: Fix an RCU warning in the reading of user keys
      KEYS: Fix an RCU warning
  11. @neilbrown

    md: restore ability of spare drives to spin down.

    neilbrown authored
    Some time ago we stopped the clean/active metadata updates
    from being written to a 'spare' device in most cases so that
    it could spin down and say spun down.  Device failure/removal
    etc are still recorded on spares.
    
    However commit 51d5668 broke this 50% of the time,
    depending on whether the event count is even or odd.
    The change log entry said:
    
       This means that the alignment between 'odd/even' and
        'clean/dirty' might take a little longer to attain,
    
    how ever the code makes no attempt to create that alignment, so it
    could take arbitrarily long.
    
    So when we find that clean/dirty is not aligned with odd/even,
    force a second metadata-update immediately.  There are already cases
    where a second metadata-update is needed immediately (e.g. when a
    device fails during the metadata update).  We just piggy-back on that.
    
    Reported-by: Joe Bryant <tenminjoe@yahoo.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
    Cc: stable@kernel.org
  12. @neilbrown

    md/raid6: Fix raid-6 read-error correction in degraded state

    Gabriele A. Trombetti authored neilbrown committed
    Fix: Raid-6 was not trying to correct a read-error when in
    singly-degraded state and was instead dropping one more device, going to
    doubly-degraded state. This patch fixes this behaviour.
    
    Tested-by: Janos Haar <janos.haar@netcenter.hu>
    Signed-off-by: Gabriele A. Trombetti <g.trombetti.lkrnl1213@logicschema.com>
    Reported-by: Janos Haar <janos.haar@netcenter.hu>
    Signed-off-by: NeilBrown <neilb@suse.de>
    Cc: stable@kernel.org
  13. @tiwai

    ALSA: hda - fix DG45ID SPDIF output

    Wu Fengguang authored tiwai committed
    This reverts part of commit 52dc438, in order to fix a regression:
    broken SPDIF output on Intel DG45FC motherboard (IDT 92HD73E1X5 codec).
    
    	--- DG45FC-IDT-codec-2.6.32  (SPDIF OK)
    	+++ DG45FC-IDT-codec-2.6.33  (SPDIF broken)
    
    	 Node 0x22 [Pin Complex] wcaps 0x400301: Stereo Digital
    	   Pincap 0x00000010: OUT
    	-  Pin Default 0x40f000f0: [N/A] Other at Ext N/A
    	-    Conn = Unknown, Color = Unknown
    	-    DefAssociation = 0xf, Sequence = 0x0
    	-  Pin-ctls: 0x00:
    	+  Pin Default 0x014510a0: [Jack] SPDIF Out at Ext Rear
    	+    Conn = Optical, Color = Black
    	+    DefAssociation = 0xa, Sequence = 0x0
    	+  Pin-ctls: 0x40: OUT
    	   Connection: 3
    	      0x25* 0x20 0x21
    	 Node 0x23 [Pin Complex] wcaps 0x400301: Stereo Digital
    	   Pincap 0x00000010: OUT
    	-  Pin Default 0x01451140: [Jack] SPDIF Out at Ext Rear
    	+  Pin Default 0x074510b0: [Jack] SPDIF Out at Ext Rear Panel
    	     Conn = Optical, Color = Black
    	-    DefAssociation = 0x4, Sequence = 0x0
    	-    Misc = NO_PRESENCE
    	-  Pin-ctls: 0x40: OUT
    	+    DefAssociation = 0xb, Sequence = 0x0
    	+  Pin-ctls: 0x00:
    	   Connection: 3
    	      0x26* 0x20 0x21
    
    Cc: <stable@kernel.org>
    Cc: Alexey Fisher <bug-track@fisher-privat.net>
    Tested-by: David Härdeman <david@hardeman.nu>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  14. blk-cgroup: Fix an RCU warning in blkiocg_create()

    Li Zefan authored Jens Axboe committed
    with CONFIG_PROVE_RCU=y, a warning can be triggered:
    
      # mount -t cgroup -o blkio xxx /mnt
      # mkdir /mnt/subgroup
    
    ...
    kernel/cgroup.c:4442 invoked rcu_dereference_check() without protection!
    ...
    
    To fix this, we avoid caling css_depth() here, which is a bit simpler
    than the original code.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Vivek Goyal <vgoyal@redhat.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  15. @lenb

    Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', …

    lenb authored
    …'bugzilla-15903' and 'misc-2.6.34' into release
Commits on May 6, 2010
  1. drm/ttm: Remove the ttm_bo_block_reservation() function.

    Thomas Hellstrom authored Dave Airlie committed
    It's unused and buggy in its current form, since it can place a bo
    in the reserved state without removing it from lru lists.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  2. drm/ttm: Remove some leftover debug messages.

    Thomas Hellstrom authored Dave Airlie committed
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  3. drm/radeon: async event synchronization for drmWaitVblank

    Jerome Glisse authored Dave Airlie committed
    Bring radeon up to speed with the async event synchronization for
    drmWaitVblank. See c9a9c5e for
    more information. Without this patch event never get delivered
    to userspace client.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  4. V4L/DVB: pxa_camera: move fifo reset direct before dma start

    Stefan Herbrechtsmeier authored Mauro Carvalho Chehab committed
    Move the fifo reset from pxa_camera_start_capture to pxa_camera_irq direct
    before the dma start after an end of frame interrupt to prevent images from
    shifting because of old data at the begin of the frame.
    
    Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
    Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Tested-by: Antonio Ospite <ospite@studenti.unina.it>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  5. @error27

    V4L/DVB: video: testing unsigned for less than 0

    error27 authored Mauro Carvalho Chehab committed
    soc_mbus_bytes_per_line() returns -EINVAL on error but we store it in an
    unsigned int so the test for less than zero doesn't work.  I think it
    always returns "small" positive values so we can just cast it to int
    here.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  6. V4L/DVB: mx1-camera: compile fix

    Uwe Kleine-König authored Mauro Carvalho Chehab committed
    This fixes a regression of
    
    	7d58289 (mx1: prefix SOC specific defines with MX1_ and deprecate old names)
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  7. @bmork

    V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer der…

    bmork authored Mauro Carvalho Chehab committed
    …eference"
    
    Never call dvb_frontend_detach if we failed to attach a frontend. This fixes
    the following oops, which will be triggered by a missing stv090x module:
    
    [    8.172997] DVB: registering new adapter (TT-Budget S2-1600 PCI)
    [    8.209018] adapter has MAC addr = 00:d0:5c:cc:a7:29
    [    8.328665] Intel ICH 0000:00:1f.5: PCI INT B -> GSI 17 (level, low) -> IRQ 17
    [    8.328753] Intel ICH 0000:00:1f.5: setting latency timer to 64
    [    8.562047] DVB: Unable to find symbol stv090x_attach()
    [    8.562117] BUG: unable to handle kernel NULL pointer dereference at 000000ac
    [    8.562239] IP: [<e08b04a3>] dvb_frontend_detach+0x4/0x67 [dvb_core]
    
    Ref http://bugs.debian.org/575207
    
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Cc: stable@kernel.org
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  8. V4L/DVB: ngene: Workaround for stuck DiSEqC pin

    Oliver Endriss authored Mauro Carvalho Chehab committed
    Send one DiSEqC byte to make sure that the pin is set to low level.
    
    Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
    Reviewed-by: Manu Abraham <abraham.manu@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  9. V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

    Hans Verkuil authored Mauro Carvalho Chehab committed
    An earlier regression fix for the mxb driver (V4L/DVB: saa7146_vv: fix
    regression where v4l2_device was registered too late) caused a new
    regression in the av7110 driver.
    
    Reverted the old fix and fixed the problem in the mxb driver instead.
    Tested on mxb and budget-av cards.
    
    The real problem is that the saa7146 framework has separate probe()
    and attach() driver callbacks which should be rolled into one. This
    is now done for the mxb driver, but others should do the same. Lack
    of hardware makes this hard to do, though. I hope to get hold of some
    hexium cards and then I can try to improve the framework to prevent
    this from happening again.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  10. V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drive…

    Hans Verkuil authored Mauro Carvalho Chehab committed
    …rs, not V4L1
    
    v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  11. V4L/DVB: feature-removal: announce videotext.h removal

    Hans Verkuil authored Mauro Carvalho Chehab committed
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  12. V4L/DVB: V4L - vpfe capture - fix for kernel crash

    Muralidharan Karicheri authored Mauro Carvalho Chehab committed
    As part of upstream merge, set_params() function was removed from isif.c.
    This requires removal of BUG_ON() and check for set_params ptr in
    vpfe_capture.c. Without this kernel crash dump is seen while bootup on DM365
    
    Also made following changes:-
    
     1) converted error messages to debug messages since it is not right to flood
        the console with error messages for user mistakes.
     2) returns -EINVAL if ioctl is not supported
    
    Signed-off-by: Muralidharan Karicheri <m-karicheri2@ti.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Something went wrong with that request. Please try again.