Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 30, 2009
  1. Linux 2.6.30-rc4

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

    authored
    …/git/ecryptfs/ecryptfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
      eCryptfs: Fix min function comparison warning
      ecryptfs: fix printk format warning
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/mchehab/linux-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      V4L/DVB (11652): au0828: fix kernel oops regression on USB disconnect.
      V4L/DVB (11626): cx23885: Two fixes for DViCO FusionHDTV DVB-T Dual Express
      V4L/DVB (11612): mx3_camera: Fix compilation with CONFIG_PM
      V4L/DVB (11570): patch: s2255drv: fix race condition on set mode
      V4L/DVB (11568): cx18: Fix the handling of i2c bus registration error
      V4L/DVB (11561a): move media after i2c
      V4L/DVB (11516): drivers/media/video/saa5246a.c: fix use-after-free
      V4L/DVB (11515): drivers/media/video/saa5249.c: fix use-after-free and leak
      V4L/DVB (11494a): cx231xx Kconfig fixes
      V4L/DVB (11494): cx18: Send correct input routing value to external audio multiplexers
Commits on Apr 29, 2009
  1. V4L/DVB (11652): au0828: fix kernel oops regression on USB disconnect.

    Devin Heitmueller authored Mauro Carvalho Chehab committed
    A regression was introduced in hg changeset 33810c734a0d, which resulted in
    a kernel panic whenever the device was disconnected from USB.  The call to
    4l2_device_register() was overwriting the pointer for usb_set_intfdata(), so
    when au0828_usb_disconnect() was called, the usb_get_intfdata() returned a
    pointer to the v4l2_device instead of the au0828_dev structure.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  2. V4L/DVB (11626): cx23885: Two fixes for DViCO FusionHDTV DVB-T Dual E…

    Christopher Pascoe authored Mauro Carvalho Chehab committed
    …xpress
    
    Two fixes for DViCO FusionHDTV DVB-T Dual Express:
    
     * Reset correct tuner when reinitializing xc3028.
     * Disable the I2C gate control to avoid locking up the I2C bus.
    
    Tested-by: John Knops <jknops@australiaonline.net.au>
    Reviewed-by: Steven Toth <stoth@linuxtv.org>
    Signed-off-by: Christopher Pascoe <linuxdvb@itee.uq.edu.au>
    Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  3. V4L/DVB (11612): mx3_camera: Fix compilation with CONFIG_PM

    Sascha Hauer authored Mauro Carvalho Chehab committed
    Signed-off-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>
  4. @deansensoray

    V4L/DVB (11570): patch: s2255drv: fix race condition on set mode

    deansensoray authored Mauro Carvalho Chehab committed
    set_modeready flag must be set before command sent to USB in
    s2255_write_config.
    
    Signed-off-by: Dean Anderson <dean@sensoray.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  5. V4L/DVB (11568): cx18: Fix the handling of i2c bus registration error

    Jean Delvare authored Mauro Carvalho Chehab committed
    * Return actual error values as returned by the i2c subsystem, rather
      than 0 or 1.
    * If the registration of the second bus fails, unregister the first one
      before exiting, otherwise we are leaking resources.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  6. @lyakh

    V4L/DVB (11561a): move media after i2c

    lyakh authored Mauro Carvalho Chehab committed
    Currently drivers/media drivers are linked very early - directly after
    base, block, misc, and mfd and before ata, scsi, ide, input, firewire,
    usb, and i2c. This breaks static build of video4linux drivers, that use
    generic CPU i2c adapter drivers and the v4l2-subdev subsystem, because
    during video4linux probing the v4l2-subdev core requires a struct
    i2c_adapter context, which cannot be satisfied before the i2c subsystem is
    initialised. Moving drivers/media after drivers/i2c fixes this problem.
    
    The best way to trigger action is by submitting a patch:-) So, let's see
    what comes out of it - on the one hand I don't see any reason why media
    has to be linked this early, and nobody was able to give me one yesterday
    as this problem has been discussed on linux-media, OTOH, maybe indeed it
    would be better to move i2c the whole way up above media, but that'd be
    much bigger of a change, I think.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-media" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  7. @error27

    V4L/DVB (11516): drivers/media/video/saa5246a.c: fix use-after-free

    error27 authored Mauro Carvalho Chehab committed
    I lowered the kfree(t) down a couple lines and removed the superflous
    "t->vdev = NULL;"
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  8. @error27

    V4L/DVB (11515): drivers/media/video/saa5249.c: fix use-after-free an…

    error27 authored Mauro Carvalho Chehab committed
    …d leak
    
    I moved the kfree() down a couple lines.  t->vdev is going to be in freed
    memory so there is no point setting it to NULL.  I added a kfree(t) on a
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  9. V4L/DVB (11494a): cx231xx Kconfig fixes

    Mauro Carvalho Chehab authored
    selecting ALSA module breaks if !SND. Just remove select.
    
    While here, let's fix the whitespacing at the Kconfig.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  10. V4L/DVB (11494): cx18: Send correct input routing value to external a…

    Andy Walls authored Mauro Carvalho Chehab committed
    …udio multiplexers
    
    A late v4l2_subdev framework change accidentally sent the audio input
    routing value to the external multiplexer, instead of the muxer input routing
    value to the external multiplexer.  This change corrects that error.
    
    Signed-off-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  11. 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: (24 commits)
      e100: do not go D3 in shutdown unless system is powering off
      netfilter: revised locking for x_tables
      Bluetooth: Fix connection establishment with low security requirement
      Bluetooth: Add different pairing timeout for Legacy Pairing
      Bluetooth: Ensure that HCI sysfs add/del is preempt safe
      net: Avoid extra wakeups of threads blocked in wait_for_packet()
      net: Fix typo in net_device_ops description.
      ipv4: Limit size of route cache hash table
      Add reference to CAPI 2.0 standard
      Documentation/isdn/INTERFACE.CAPI
      update Documentation/isdn/00-INDEX
      ixgbe: Fix WoL functionality for 82599 KX4 devices
      veth: prevent oops caused by netdev destructor
      xfrm: wrong hash value for temporary SA
      forcedeth: tx timeout fix
      net: Fix LL_MAX_HEADER for CONFIG_TR_MODULE
      mlx4_en: Handle page allocation failure during receive
      mlx4_en: Fix cleanup flow on cq activation
      vlan: update vlan carrier state for admin up/down
      netfilter: xt_recent: fix stack overread in compat code
      ...
  12. @davem330

    e100: do not go D3 in shutdown unless system is powering off

    Thadeu Lima de Souza Cascardo authored davem330 committed
    After experimenting with kexec with the last merges after 2.6.29, I've
    had some problems when probing e100.  It would not read the eeprom.  After
    some bisects, I realized this has been like that since forever (at least
    2.6.18).  The problem is that shutdown is doing the same thing that
    suspend does and puts the device in D3 state.  I couldn't find a way to
    get the device back to a sane state in the probe function.  So, based on
    some similar patches from Rafael J. Wysocki for e1000, e1000e, and ixgbe,
    I wrote this one for e100.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
    Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. @davem330
  14. @davem330

    netfilter: revised locking for x_tables

    Stephen Hemminger authored davem330 committed
    The x_tables are organized with a table structure and a per-cpu copies
    of the counters and rules. On older kernels there was a reader/writer 
    lock per table which was a performance bottleneck. In 2.6.30-rc, this
    was converted to use RCU and the counters/rules which solved the performance
    problems for do_table but made replacing rules much slower because of
    the necessary RCU grace period.
    
    This version uses a per-cpu set of spinlocks and counters to allow to
    table processing to proceed without the cache thrashing of a global
    reader lock and keeps the same performance for table updates.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/k…

    authored
    …ernel/git/anholt/drm-intel
    
    * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: fix up error path leak in i915_cmdbuffer
      drm/i915: fix unpaired i915 device mutex on entervt failure.
      drm/i915: add support for G41 chipset
      drm/i915: Enable ASLE if present
      drm/i915: Unregister ACPI video driver when exiting
      drm/i915: Register ACPI video even when not modesetting
      drm/i915: fix transition to I915_TILING_NONE
      drm/i915: Don't let an oops get triggered from irq_emit without dma init.
      drm/i915: allow tiled front buffers on 965+
  16. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (21 commits)
      RDMA/nes: Update iw_nes version
      RDMA/nes: Fix error path in nes_accept()
      RDMA/nes: Fix hang issues for large cluster dynamic connections
      RDMA/nes: Increase rexmit timeout interval
      RDMA/nes: Check for sequence number wrap-around
      RDMA/nes: Do not set apbvt entry for loopback
      RDMA/nes: Fix unused variable compile warning when INFINIBAND_NES_DEBUG=n
      RDMA/nes: Fix fw_ver in /sys
      RDMA/nes: Set trace length to 1 inch for SFP_D
      RDMA/nes: Enable repause timer for port 1
      RDMA/nes: Correct CDR loop filter setting for port 1
      RDMA/nes: Modify thermo mitigation to flip SerDes1 ref clk to internal
      RDMA/nes: Fix resource issues in nes_create_cq() and nes_destroy_cq()
      RDMA/nes: Remove root_256()'s unused pbl_count_256 parameter
      mlx4_core: Fix memory leak in mlx4_enable_msi_x()
      IB/mthca: Fix timeout for INIT_HCA and a few other commands
      RDMA/cxgb3: Don't zero QP attrs when moving to IDLE
      RDMA/nes: Fix bugs in nes_reg_phys_mr()
      RDMA/nes: Fix compiler warning at nes_verbs.c:1955
      IPoIB: Disable NAPI while CQ is being drained
      ...
Commits on Apr 28, 2009
  1. @geertu

    m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h>

    geertu authored committed
    Fix this:
    
      arch/m68k/kernel/sun3-head.S: Assembler messages:
      arch/m68k/kernel/sun3-head.S:32: Error: Unknown operator -- statement `__head' ignored
    
    Introduced by commit 6f335ca ("m68k:
    convert to use __HEAD and HEAD_TEXT macros."), which started using
    __HEAD without adding the appropriate include.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      bio: fix memcpy corruption in bio_copy_user_iov()
      hd: fix locking
      mg_disk: fix CONFIG_LBD=y warning
      mg_disk: fix locking
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator: Fix default constraints for fixed voltage regulators
      regulator/bq24022: fix bug in is_enabled function
      regulator/virtual: fix strings compare predicates
      regulator core: fix double-free in regulator_register() error path
      drivers/regulator: fix when type is different from REGULATOR_VOLTAGE or REGULATOR_CURRENT
      unreachable code in drms_uA_update()
      regulator: fix header file missing kernel-doc
  4. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    authored
    …/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      powerpc/ps3: Fix build error on UP
      powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
      powerpc: ppc32 needs elf_read_implies_exec()
      powerpc/86xx: Add device_type entry to soc for ppc9a
      powerpc/44x: Correct memory size calculation for denali-based boards
      maintainers: Fix PowerPC 4xx git tree
      powerpc: fix for long standing bug noticed by gcc 4.4.0
      Revert "powerpc: Add support for early tlbilx opcode"
  5. @timabbott

    powerpc: Revert switch to TEXT_TEXT in linker script

    timabbott authored committed
    Commit edada39 broke the build on 64-bit powerpc because it moved the
    __ftr_alt_* sections of a file away from the .text section, causing
    link failures due to relative conditional branch targets being too far
    away from the branch instructions.  This happens on pretty much all
    64-bit powerpc configs.
    
    This change reverts commit edada39 while preserving the update from
    the *.refok sections to .ref.text that has happened since.
    
    Signed-off-by: Tim Abbott <tabbott@mit.edu>
    Requested-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @fujita

    bio: fix memcpy corruption in bio_copy_user_iov()

    fujita authored Jens Axboe committed
    st driver uses blk_rq_map_user() in order to just build a request out
    of page frames. In this case, map_data->offset is a non zero value and
    iov[0].iov_base is NULL. We need to increase nr_pages for that.
    
    Cc: stable@kernel.org
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  7. hd: fix locking

    Tejun Heo authored Jens Axboe committed
    hd dance around local irq and HD_IRQ enable without achieving much.
    It ends up transferring data from irq handler with both local irq and
    HD_IRQ disabled.  The only place it actually does something is while
    transferring the first block of a request which it does with HD_IRQ
    disabled but local irq enabled.
    
    Unfortunately, the dancing is horribly broken from locking POV.  IRQ
    and timeout handlers access block queue without grabbing the queue
    lock and running the driver in SMP configuration crashes the whole
    machine pretty quickly.
    
    Remove meaningless irq enable/disable dancing and add proper locking
    in issue, irq and timeout paths.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
  8. @bzolnier

    mg_disk: fix CONFIG_LBD=y warning

    bzolnier authored Jens Axboe committed
    drivers/block/mg_disk.c: In function ‘mg_dump_status’:
    drivers/block/mg_disk.c:265: warning: format ‘%ld’ expects type ‘long int’, but
    argument 2 has type ‘sector_t’
    
    [ Impact: kill build warning ]
    
    Cc: unsik Kim <donari75@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>
  9. mg_disk: fix locking

    Tejun Heo authored Jens Axboe committed
    IRQ and timeout handlers call functions which expect locked queue lock
    without locking it.  Fix it.
    
    While at it, convert 0s used as null pointer constant to NULLs.
    
    [ Impact: fix locking, cleanup ]
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: unsik Kim <donari75@gmail.com>
  10. @broonie

    regulator: Fix default constraints for fixed voltage regulators

    broonie authored Liam Girdwood committed
    Default voltage constraints were being provided for fixed voltage
    regulator where board constraints were not provided but these constraints
    used INT_MIN as the default minimum voltage which is not a valid value
    since it is less than zero. Use 1uV instead.
    
    Also set the default values we set in the constraints themselves since
    otherwise the max_uV constraint we determine will not be stored in the
    actual constraint strucutre and will therefore not be used.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  11. @pH5

    regulator/bq24022: fix bug in is_enabled function

    pH5 authored Liam Girdwood committed
    This seems to be fallout from last October's regulator core rework.
    It got noticed only because of recent regulator framework changes.
    
    Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  12. regulator/virtual: fix strings compare predicates

    Mike Rapoport authored Liam Girdwood committed
    Signed-off-by: Mike Rapoport <mike@compulab.co.il>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  13. regulator core: fix double-free in regulator_register() error path

    Paul Walmsley authored Liam Girdwood committed
    During regulator registration, any error after device_register() will
    cause a double-free on the struct regulator_dev 'rdev'.  The bug is in
    drivers/regulator/core.c:regulator_register():
    
    ...
    scrub:
    	device_unregister(&rdev->dev);
    clean:
    	kfree(rdev);                           <---
    	rdev = ERR_PTR(ret);
    	goto out;
    ...
    
    device_unregister() calls regulator_dev_release() which frees rdev.  The
    subsequent kfree corrupts memory and causes some OMAP3 systems to oops on
    boot in regulator_get().
    
    Applies against 2.6.30-rc3.
    
    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  14. drivers/regulator: fix when type is different from REGULATOR_VOLTAGE …

    Diego Liziero authored Liam Girdwood committed
    …or REGULATOR_CURRENT
    
    When regulator_desc->type is something different from REGULATOR_VOLTAGE or REGULATOR_CURRENT
    the if should probably return ERR_PTR(-EINVAL)
    
    The semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    @@ expression E; constant C; @@
    (
    - !E == C
    + E != C
    )
    
    Signed-off-by: Diego Liziero <diegoliz@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  15. @error27

    unreachable code in drms_uA_update()

    error27 authored Liam Girdwood committed
    I removed the extra semi-colon and indented the return statement.
    
    The unreachable code was found by smatch (http://repo.or.cz/w/smatch.git).
    The patch was compile tested.
    
    regards,
    dan carpenter
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Something went wrong with that request. Please try again.