12 Jul, 2011

1 commit


07 Jul, 2011

8 commits

  • * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
    gpio: tps65910: add missing breaks in tps65910_gpio_init

    Linus Torvalds
     
  • All the blkio.throttle.* file names are incorrectly reported without
    ".throttle" in the documentation. Fix it.

    Signed-off-by: Andrea Righi
    Signed-off-by: Randy Dunlap
    Acked-by: Vivek Goyal
    Signed-off-by: Linus Torvalds

    Andrea Righi
     
  • The list of available general purpose memory allocators in
    Documentation/CodingStyle chapter 14 is incomplete. This patch adds
    the missing vzalloc() to the list.

    Signed-off-by: Jesper Juhl
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Jesper Juhl
     
  • Move location of quilt series for kernel-doc patches.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
    [media] rc: call input_sync after scancode reports
    [media] imon: allow either proto on unknown 0xffdc
    [media] imon: auto-config ffdc 7e device
    [media] saa7134: fix raw IR timeout value
    [media] rc: fix ghost keypresses with certain hw
    [media] [staging] lirc_serial: allocate irq at init time
    [media] lirc_zilog: fix spinning rx thread
    [media] keymaps: fix table for pinnacle pctv hd devices
    [media] ite-cir: 8709 needs to use pnp resource 2
    [media] V4L: mx1-camera: fix uninitialized variable
    [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
    [media] OMAP_VOUT: Change hardcoded device node number to -1
    [media] OMAP_VOUTLIB: Fix wrong resizer calculation
    [media] uvcvideo: Disable the queue when failing to start
    [media] uvcvideo: Remove buffers from the queues when freeing
    [media] uvcvideo: Ignore entities for terminals with no supported format
    [media] v4l: Don't access media entity after is has been destroyed
    [media] media: omap3isp: fix a potential NULL deref
    [media] media: vb2: fix allocation failure check
    [media] media: vb2: reset queued_count value during queue reinitialization
    ...

    Fix up trivial conflict in MAINTAINERS as per Mauro

    Linus Torvalds
     
  • The shdr4extnum variable isn't being freed in the cleanup process of
    elf_fdpic_core_dump().

    Signed-off-by: Davidlohr Bueso
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Provides the ability to resize a resource that is already allocated.
    This functionality is put in place to support reallocation needs of
    pci resources.

    Signed-off-by: Ram Pai
    Acked-by: Jesse Barnes
    Signed-off-by: Linus Torvalds

    Ram Pai
     
  • locks_alloc_lock() assumed that the allocated struct file_lock is
    already initialized to zero members. This is only true for the first
    allocation of the structure, after reuse some of the members will have
    random values.

    This will for example result in passing random fl_start values to
    userspace in fuse for FL_FLOCK locks, which is an information leak at
    best.

    Fix by reinitializing those members which may be non-zero after freeing.

    Signed-off-by: Miklos Szeredi
    CC: stable@kernel.org
    Signed-off-by: Linus Torvalds

    Miklos Szeredi
     

06 Jul, 2011

5 commits


05 Jul, 2011

11 commits

  • Base on Mark's comment [1], I make the Kconfig entry invisible to users.
    [1] https://lkml.org/lkml/2011/5/14/136

    Signed-off-by: Axel Lin
    Signed-off-by: Samuel Ortiz

    Axel Lin
     
  • Fix below build error:
    CC drivers/mfd/tps65911-comparator.o
    drivers/mfd/tps65911-comparator.c: In function 'tps65911_comparator_probe':
    drivers/mfd/tps65911-comparator.c:131: error: 'struct tps65910_platform_data' has no member named 'vmbch_threshold'
    drivers/mfd/tps65911-comparator.c:137: error: 'struct tps65910_platform_data' has no member named 'vmbch2_threshold'
    make[2]: *** [drivers/mfd/tps65911-comparator.o] Error 1
    make[1]: *** [drivers/mfd] Error 2
    make: *** [drivers] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Samuel Ortiz

    Axel Lin
     
  • This reverts commit 7e6502d577106fb5b202bbaac64c5f1b065e6daa.

    Oops are produced during initialization of ehci and ohci
    drivers. This is because the run time pm apis are used by
    the driver but the corresponding hwmod structures and
    initialization is not merged. hence revering back the
    commit id 7e6502d577106fb5b202bbaac64c5f1b065e6daa

    Signed-off-by: Keshava Munegowda
    Reported-by: Luciano Coelho
    Acked-by: Felipe Balbi
    Signed-off-by: Samuel Ortiz

    Keshava Munegowda
     
  • mfd_get_data() has been removed from the MFD API.

    Cc: Anirudh Ghayal
    Signed-off-by: Samuel Ortiz

    Samuel Ortiz
     
  • mfd_get_data() has been removed from the MFD API.

    Cc: Anirudh Ghayal
    Signed-off-by: Samuel Ortiz

    Samuel Ortiz
     
  • Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (277 commits)
    [SCSI] isci: fix checkpatch errors
    isci: Device reset should request sas_phy_reset(phy, true)
    isci: pare back error messsages
    isci: cleanup silicon revision detection
    isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h
    isci: merge sata.[ch] into request.c
    isci: kill 'get/set' macros
    isci: retire scic_sds_ and scic_ prefixes
    isci: unify isci_host and scic_sds_controller
    isci: unify isci_remote_device and scic_sds_remote_device
    isci: unify isci_port and scic_sds_port
    isci: fix scic_sds_remote_device_terminate_requests
    isci: unify isci_phy and scic_sds_phy
    isci: unify isci_request and scic_sds_request
    isci: rename / clean up scic_sds_stp_request
    isci: preallocate requests
    isci: combine request flags
    isci: unify can_queue tracking on the tci_pool, uplevel tag assignment
    isci: Terminate dev requests on FIS err bit rx in NCQ
    isci: fix frame received locking
    ...

    Linus Torvalds
     
  • * 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
    AT91: Change nand buswidth logic to match hardware default configuration
    at91: Use "pclk" as con_id on at91cap9 and at91rm9200
    at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
    atmel_serial: fix internal port num
    at91: fix at91_set_serial_console: use platform device id

    Linus Torvalds
     
  • …l/git/lethal/fbdev-3.x

    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
    vesafb: fix memory leak
    fbdev: amba: Link fb device to its parent
    fsl-diu-fb: remove check for pixel clock ranges
    udlfb: Correct sub-optimal resolution selection.
    hecubafb: add module_put on error path in hecubafb_probe()
    sm501fb: fix section mismatch warning
    gx1fb: Fix section mismatch warnings
    fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane

    Linus Torvalds
     
  • Commits 71c29bd5c235 ("IB/uverbs: Add devnode method to set path/mode")
    and c3af0980ce01 ("IB: Add devnode methods to cm_class and umad_class")
    added devnode methods that set the mode.

    However, these methods don't check for a NULL mode, and so we get a
    crash when unloading modules because devtmpfs_delete_node() calls
    device_get_devnode() with mode == NULL.

    Add the missing checks.

    Signed-off-by: Goldwyn Rodrigues
    [ Also fix cm.c. - Roland ]
    Signed-off-by: Roland Dreier
    Signed-off-by: Linus Torvalds

    Goldwyn Rodrigues
     
  • The recently modified nand buswitth configuration is not aligned with
    board reality: the double footprint on boards is always populated with 8bits
    buswidth nand flashes.
    So we have to consider that without particular configuration the 8bits
    buswidth is selected by default.
    Moreover, the previous logic was always using !board_have_nand_8bit(), we
    change it to a simpler: board_have_nand_16bit().

    Signed-off-by: Nicolas Ferre
    Tested-by: Ludovic Desroches
    Signed-off-by: Arnd Bergmann

    Nicolas Ferre
     

04 Jul, 2011

6 commits


03 Jul, 2011

9 commits