Skip to content
Commits on May 7, 2010
  1. @torvalds

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

    * '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
    torvalds committed May 7, 2010
  2. @torvalds

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

    …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
    torvalds committed May 7, 2010
  3. @torvalds

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

    * '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
    torvalds committed May 7, 2010
  4. @torvalds

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

    …/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
    torvalds committed May 7, 2010
  5. @stintel @torvalds

    virtio: initialize earlier

    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>
    stintel committed with torvalds May 7, 2010
  6. @torvalds

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

    …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()
    torvalds committed May 7, 2010
  7. @torvalds

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

    …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
    torvalds committed May 7, 2010
  8. @torvalds

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

    …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
    torvalds committed May 7, 2010
  9. @torvalds

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

    …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
    torvalds committed May 7, 2010
  10. @neilbrown

    md: restore ability of spare drives to spin down.

    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
    neilbrown committed May 7, 2010
  11. @neilbrown

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

    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
    Gabriele A. Trombetti committed with neilbrown Apr 28, 2010
  12. blk-cgroup: Fix an RCU warning in blkiocg_create()

    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>
    Li Zefan committed with Jens Axboe May 7, 2010
  13. @lenb

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

    …'bugzilla-15903' and 'misc-2.6.34' into release
    lenb committed May 6, 2010
Commits on May 6, 2010
  1. @thomashvmw

    drm/ttm: Remove the ttm_bo_block_reservation() function.

    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>
    thomashvmw committed with Dave Airlie Apr 28, 2010
  2. @thomashvmw

    drm/ttm: Remove some leftover debug messages.

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

    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>
    Jerome Glisse committed with Dave Airlie May 6, 2010
  4. V4L/DVB: pxa_camera: move fifo reset direct before dma start

    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>
    Stefan Herbrechtsmeier committed with Mauro Carvalho Chehab Apr 20, 2010
  5. @error27

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

    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>
    error27 committed with Mauro Carvalho Chehab Apr 7, 2010
  6. V4L/DVB: mx1-camera: compile fix

    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>
    Uwe Kleine-König committed with Mauro Carvalho Chehab Mar 27, 2010
  7. @bmork

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

    …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>
    bmork committed with Mauro Carvalho Chehab Mar 24, 2010
  8. V4L/DVB: ngene: Workaround for stuck DiSEqC pin

    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>
    Oliver Endriss committed with Mauro Carvalho Chehab Mar 21, 2010
  9. V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

    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>
    Hans Verkuil committed with Mauro Carvalho Chehab Mar 24, 2010
  10. V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drive…

    …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>
    Hans Verkuil committed with Mauro Carvalho Chehab Mar 22, 2010
  11. V4L/DVB: feature-removal: announce videotext.h removal

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

    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>
    Muralidharan Karicheri committed with Mauro Carvalho Chehab Mar 18, 2010
  13. @ellson

    V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver

    The 0461:0815 camera is spca561 based not spca508
    
    Signed-off-by: John Ellson <john.ellson@comcast.net>
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    ellson committed with Mauro Carvalho Chehab Mar 17, 2010
  14. @ErikAndren

    V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver

    The 046d:08da usb id shouldn't be associated with the stv06xx driver as they're
    not compatible with each other.
    This fixes a bug where Quickcam Messenger cams fail to use its proper driver
    (gspca-zc3xx), rendering the camera inoperable.
    
    Signed-off-by: Erik Andrén <erik.andren@gmail.com>
    Tested-by: Gabriel Craciunescu <nix.or.die@googlemail.com>
    Signed-off-by: Jean-François Moine <moinejf@free.fr>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    ErikAndren committed with Mauro Carvalho Chehab Mar 8, 2010
  15. @yongzhang

    V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration

    Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy
    
    Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
    Signed-off-by: Jean-François Moine <moinejf@free.fr>
    CC: Brian Johnson <brijohn@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    yongzhang committed with Mauro Carvalho Chehab Feb 5, 2010
  16. V4L/DVB: saa7146: fix up bytesperline if it is an impossible value

    xawtv using DGA on a Radeon graphics card provides bogus
    values to S_FBUF, which will then screw up overlay video:
    
    https://bugs.launchpad.net/ubuntu/+source/xawtv/+bug/499734
    
    This fixes the bytesperline value if it is off completely.
    
    Signed-off-by: Michael Hunold <michael@mihu.de>
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Michael Hunold committed with Mauro Carvalho Chehab Mar 13, 2010
  17. V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails

    This patch fixes a bug in vpfe_probe() that doesn't call mutex_unlock() if memory
    allocation for ccdc_cfg fails. See also the smatch warning report from Dan
    Carpenter that shows this as an issue.
    
    Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Murali Karicheri committed with Mauro Carvalho Chehab Mar 1, 2010
  18. V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci

    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Vaibhav Hiremath committed with Mauro Carvalho Chehab Mar 13, 2010
  19. @error27

    V4L/DVB: omap24xxcam: potential buffer overflow

    The previous loop goes until last == VIDEO_MAX_FRAME, so this could
    potentially go one past the end of the loop.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    error27 committed with Mauro Carvalho Chehab Mar 10, 2010
  20. @kamalmostafa @lenb

    ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x

    Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
    list to fix hang on resume.
    
    BugLink: http://bugs.launchpad.net/bugs/553498
    
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    Acked-by: Alex Chiang <achiang@canonical.com>
    Cc: stable@kernel.org
    Signed-off-by: Len Brown <len.brown@intel.com>
    kamalmostafa committed with lenb Apr 27, 2010
  21. @paulmck

    rcu: create rcu_my_thread_group_empty() wrapper

    Some RCU-lockdep splat repairs need to know whether they are running
    in a single-threaded process.  Unfortunately, the thread_group_empty()
    primitive is defined in sched.h, and can induce #include hell.  This
    commit therefore introduces a rcu_my_thread_group_empty() wrapper that
    is defined in rcupdate.c, thus avoiding the need to include sched.h
    everywhere.
    
    Signed-off-by: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
    paulmck committed May 6, 2010
  22. @torvalds

    Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Defconfig update
      microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros
      microblaze: Fix consistent-sync code
      microblaze: Define correct L1_CACHE_SHIFT value
      microblaze: cpuinfo shows cache line length
      microblaze: Fix kmalloc alignment on non-coherent DMA platforms
      microblaze: Fix typo fault in cache code
      microblaze: Fix consistent code
      microblaze: pci-dma: use include/linux/dma-mapping.h
      microblaze: page.h: Remove get_user_page and free_user_page
      microblaze: Remove "cache" optimized copy_page function
      microblaze: invoke oom-killer from page fault
      microblaze: fix divide by zero exception message
      microblaze: Add isa_dma_bridge_buggy to dma.h
      microblaze: Remove ancient code
      microblaze: Quiet section mismatch warnings for MMU version
      microblaze: Quiet section mismatch warnings
      microblaze: Fix IRQ entry/exit ftracing
      microblaze: resource/PCI: align functions now return start of resource
      microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
    torvalds committed May 6, 2010
Something went wrong with that request. Please try again.