Permalink
Switch branches/tags
Commits on Feb 25, 2010
  1. Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

    torvalds committed Feb 25, 2010
    * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits)
      of: remove undefined request_OF_resource & release_OF_resource
      of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
      of: move definition of of_chosen into common code.
      of: remove unused extern reference to devtree_lock
      of: put default string compare and #a/s-cell values into common header
      of/flattree: Don't assume HAVE_LMB
      of: protect linux/of.h with CONFIG_OF
      proc_devtree: fix THIS_MODULE without module.h
      of: Remove old and misplaced function declarations
      of/flattree: Make the kernel accept ePAPR style phandle information
      of/flattree: endian-convert members of boot_param_header
      of: assume big-endian properties, adding conversions where necessary
      of: use __be32 for cell value accessors
      of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
      of/flattree: use callback to setup initrd from /chosen
      proc_devtree: include linux/of.h
      of: make set_node_proc_entry private to proc_devtree.c
      of: include linux/proc_fs.h
      of/flattree: merge early_init_dt_scan_memory() common code
      of: add 'of_' prefix to machine_is_compatible()
      ...
  2. Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

    torvalds committed Feb 25, 2010
    * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (31 commits)
      spi: Correct SPI clock frequency setting in spi_mpc8xxx
      spi/spi_s3c64xx.c: Fix continuation line formats
      spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK
      spi/dw_spi: Allow dw_spi.c to be a module
      spi/dw_spi: mmio code style fixups
      Memory-mapped dw_spi driver
      spi/dw_spi: fix missing export of dw_spi_remove_host
      spi/dw_spi: conditional transfer mode changes
      spi/dw_spi: remove conditional from 'poll_transfer'.
      spi/dw_spi: fixed a spelling typo in a warning message.
      spi/dw_spi: add return value to empty mrst_spi_debugfs_init()
      spi/dw_spi: enable platform specific chipselect.
      spi/dw_spi: add a FIFO depth detection
      spi/dw_spi: fix __init/__devinit section mismatch
      spi: xilinx_spi: Fix up I/O routine wrapping bogosity.
      spi/spi_imx: add device information by switching pr_debug() to dev_dbg()
      spi: update MSIOF includes
      spi/dw_spi: refine the IRQ mode working flow
      spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence
      spi/dw_spi: bug fix in wait_till_not_busy()
      ...
  3. Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Feb 25, 2010
    …el/git/rostedt/linux-2.6-kconfig
    
    * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
      kconfig: Simplify LSMOD= handling
      kconfig: Add LSMOD=file to override the lsmod for localmodconfig
      kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
      kconfig: Check for if conditions in Kconfig for localmodconfig
      kconfig: Create include/generated for localmodconfig
  4. Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Feb 25, 2010
    …el/git/rostedt/linux-2.6-kconfig
    
    * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
      kconfig: simplification of scripts/extract-ikconfig
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Feb 25, 2010
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (41 commits)
      HID: usbhid: initialize interface pointers early enough
      HID: extend mask for BUTTON usage page
      HID: hid-ntrig: Single touch mode tap
      HID: hid-ntrig: multitouch cleanup and fix
      HID: n-trig: remove unnecessary tool switching
      HID: hid-ntrig add multi input quirk and clean up
      HID: usbhid: introduce timeout for stuck ctrl/out URBs
      HID: magicmouse: coding style and probe failure fixes
      HID: remove MODULE_VERSION from new drivers
      HID: fix up Kconfig entry for MagicMouse
      HID: add a device driver for the Apple Magic Mouse.
      HID: Export hid_register_report
      HID: Support for MosArt multitouch panel
      HID: add pressure support for the Stantum multitouch panel
      HID: fixed bug in single-touch emulation on the stantum panel
      HID: fix typo in error message
      HID: add mapping for "AL Network Chat" usage
      HID: use multi input quirk for TouchPack touchscreen
      HID: make full-fledged hid-bus drivers properly selectable
      HID: make Wacom modesetting failures non-fatal
      ...
  6. Merge branches 'upstream', 'raw_report_modifications' and 'apple_magi…

    Jiri Kosina committed Feb 25, 2010
    …c_mouse' into for-linus
    
    Conflicts:
    	drivers/hid/Kconfig
  7. Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds committed Feb 25, 2010
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (44 commits)
      Add MAINTAINERS entry for virtio_console
      virtio: console: Fill ports' entire in_vq with buffers
      virtio: console: Error out if we can't allocate buffers for control queue
      virtio: console: Add ability to remove module
      virtio: console: Ensure no memleaks in case of unused buffers
      virtio: console: show error message if hvc_alloc fails for console ports
      virtio: console: Add debugfs files for each port to expose debug info
      virtio: console: Add ability to hot-unplug ports
      virtio: console: Handle port hot-plug
      virtio: console: Remove cached data on port close
      virtio: console: Register with sysfs and create a 'name' attribute for ports
      virtio: console: Ensure only one process can have a port open at a time
      virtio: console: Add file operations to ports for open/read/write/poll
      virtio: console: Associate each port with a char device
      virtio: console: Prepare for writing to userspace buffers
      virtio: console: Add a new MULTIPORT feature, support for generic ports
      virtio: console: Introduce a send_buf function for a common path for sending data to host
      virtio: console: Introduce function to hand off data from host to readers
      virtio: console: Separate out find_vqs operation into a different function
      virtio: console: Separate out console init into a new function
      ...
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Feb 25, 2010
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      netlabel: fix export of SELinux categories > 127
  9. netlabel: fix export of SELinux categories > 127

    Joshua Roys committed with James Morris Feb 24, 2010
    This fixes corrupted CIPSO packets when SELinux categories greater than 127
    are used.  The bug occured on the second (and later) loops through the
    while; the inner for loop through the ebitmap->maps array used the same
    index as the NetLabel catmap->bitmap array, even though the NetLabel bitmap
    is twice as long as the SELinux bitmap.
    
    Signed-off-by: Joshua Roys <joshua.roys@gtri.gatech.edu>
    Acked-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  10. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed Feb 25, 2010
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI
  11. ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI

    robhancock committed with Jeff Garzik Jan 27, 2010
    Mike Cui reported that his system with an NVIDIA MCP79 (aka MCP7A)
    chipset stopped working with 2.6.32. The problem appears to be that
    2.6.32 now enables the FPDMA auto-activate optimization in the ahci
    driver. The drive works fine with this enabled on an Intel AHCI so
    this appears to be a chipset bug.  Since MCP79 is a fairly recent
    NVIDIA chipset and we don't have any info on whether any other NVIDIA
    chipsets have this issue, disable FPDMA AA optimization on all NVIDIA
    AHCI controllers for now.
    
    Should address http://bugzilla.kernel.org/show_bug.cgi?id=14922
    
    Signed-off-by: Robert Hancock <hancockrwd@gmail.com>
    While-we-investigate-issue-this-patch-looks-good-to-me-by:
    	Prajakta Gudadhe <pgudadhe@nvidia.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Cc: stable@kernel.org
Commits on Feb 24, 2010
  1. security: fix error return path in ima_inode_alloc

    Xiaotian Feng committed with James Morris Feb 24, 2010
    If radix_tree_preload is failed in ima_inode_alloc, we don't need
    radix_tree_preload_end because kernel is alread preempt enabled
    
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. Linux 2.6.33

    torvalds committed Feb 24, 2010
  3. Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds committed Feb 24, 2010
    …t/kyle/parisc-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      parisc: Set PCI CLS early in boot.
  4. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Feb 24, 2010
    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Fix broken sn2 build
  5. parisc: Set PCI CLS early in boot.

    Carlos O'Donell committed with jkkm Feb 22, 2010
    Set the PCI CLS early in the boot process to prevent
    device failures. In pcibios_set_master use the new
    pci_cache_line_size instead of a hard-coded value.
    
    Signed-off-by: Carlos O'Donell <carlos@codesourcery.com>
    Reviewed-by: Grant Grundler <grundler@google.com>
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
  6. Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    torvalds committed Feb 24, 2010
    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Fix out_le32() macro
      microblaze: Fix cache loop function for cache range
  7. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds committed Feb 24, 2010
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      Revert "block: improve queue_should_plug() by looking at IO depths"
  8. microblaze: Fix out_le32() macro

    smagnani committed with michalsimek Feb 22, 2010
    Trailing semicolon causes compilation involving out_le32() to fail.
    
    Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  9. microblaze: Fix cache loop function for cache range

    michalsimek committed Feb 15, 2010
    I create wrong asm code but none test shows that this part of code is wrong.
    I am not convinces that were good idea to create asm optimized macros
    for caches. The reason is that there is not optimization with previous code
    that's why make sense to add old code and do some benchmarking which
    functions are faster.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  10. Add MAINTAINERS entry for virtio_console

    Amit Shah committed with rustyrussell Feb 12, 2010
    I'm taking ownership of the virtio_console module; but I'll continue
    feeding patches via Rusty.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  11. virtio: console: Fill ports' entire in_vq with buffers

    Amit Shah committed with rustyrussell Feb 12, 2010
    Instead of allocating just one buffer for a port's in_vq, fill
    the entire in_vq with buffers so the host need not stall while
    an application consumes the data and makes the buffer available
    again for the host.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  12. virtio: console: Error out if we can't allocate buffers for control q…

    Amit Shah committed with rustyrussell Feb 12, 2010
    …ueue
    
    With MULTIPORT support, the control queue is an integral part of the
    functioning of the device. If we can't get any buffers allocated, the
    host won't be able to relay important information and the device may not
    function as intended.
    
    Ensure 'probe' doesn't succeed until the control queue has at least one
    buffer allocated for its ivq.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  13. virtio: console: Add ability to remove module

    Amit Shah committed with rustyrussell Feb 12, 2010
    Add the ability to remove the virtio_console module.
    
    This aids debugging.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  14. virtio: console: Ensure no memleaks in case of unused buffers

    Amit Shah committed with rustyrussell Feb 12, 2010
    If unused data exists in in_vq, ensure we flush that first and then
    detach unused buffers, which will ensure all buffers from the in_vq are
    removed.
    
    Also ensure we free the buffers after detaching them.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  15. virtio: console: show error message if hvc_alloc fails for console ports

    Amit Shah committed with rustyrussell Jan 18, 2010
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  16. virtio: console: Add debugfs files for each port to expose debug info

    Amit Shah committed with rustyrussell Dec 21, 2009
    This is helpful in examining ports' state.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  17. virtio: console: Add ability to hot-unplug ports

    Amit Shah committed with rustyrussell Dec 21, 2009
    Remove port data; deregister from the hvc core if it's a console port.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  18. virtio: console: Handle port hot-plug

    Amit Shah committed with rustyrussell Dec 21, 2009
    If the 'nr_ports' variable in the config space is updated to a higher
    value, that means new ports have been hotplugged.
    
    Introduce a new workqueue to handle such updates and create new ports.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  19. virtio: console: Remove cached data on port close

    Amit Shah committed with rustyrussell Dec 21, 2009
    Remove any data that we might have in a port's inbuf when closing a port
    or when any data is received when a port is closed.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  20. virtio: console: Register with sysfs and create a 'name' attribute fo…

    Amit Shah committed with rustyrussell Dec 21, 2009
    …r ports
    
    The host can set a name for ports so that they're easily discoverable
    instead of going by the /dev/vportNpn naming. This attribute will be
    placed in /sys/class/virtio-ports/vportNpn/name. udev scripts can then
    create symlinks to the port using the name.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  21. virtio: console: Ensure only one process can have a port open at a time

    Amit Shah committed with rustyrussell Nov 26, 2009
    Add a guest_connected field that ensures only one process
    can have a port open at a time.
    
    This also ensures we don't have a race when we later add support for
    dropping buffers when closing the char dev and buffer caching is turned
    off for the particular port.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  22. virtio: console: Add file operations to ports for open/read/write/poll

    Amit Shah committed with rustyrussell Dec 21, 2009
    Allow guest userspace applications to open, read from, write to, poll
    the ports via the char dev interface.
    
    When a port gets opened, a notification is sent to the host via a
    control message indicating a connection has been established. Similarly,
    on closing of the port, a notification is sent indicating disconnection.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  23. virtio: console: Associate each port with a char device

    Amit Shah committed with rustyrussell Dec 21, 2009
    The char device will be used as an interface by applications on the
    guest to communicate with apps on the host.
    
    The devices created are placed in /dev/vportNpn where N is the
    virtio-console device number and n is the port number for that device.
    
    One dynamic major device number is allocated for each device and minor
    numbers are allocated for the ports contained within that device.
    
    The file operation for the char devs will be added in the following
    commits.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  24. virtio: console: Prepare for writing to userspace buffers

    Amit Shah committed with rustyrussell Dec 21, 2009
    When ports get advertised as char devices, the buffers will come from
    userspace. Equip the fill_readbuf function with the ability to write
    to userspace buffers.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>