Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-git3

Feb 26, 2010

  1. Linus Torvalds

    Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/jbarnes/pci-2.6
    
    * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (48 commits)
      x86/PCI: Prevent mmconfig memory corruption
      ACPI: Use GPE reference counting to support shared GPEs
      x86/PCI: use host bridge _CRS info by default on 2008 and newer machines
      PCI: augment bus resource table with a list
      PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
      PCI: read bridge windows before filling in subtractive decode resources
      PCI: split up pci_read_bridge_bases()
      PCIe PME: use pci_pcie_cap()
      PCI PM: Run-time callbacks for PCI bus type
      PCIe PME: use pci_is_pcie()
      PCI / ACPI / PM: Platform support for PCI PME wake-up
      ACPI / ACPICA: Multiple system notify handlers per device
      ACPI / PM: Add more run-time wake-up fields
      ACPI: Use GPE reference counting to support shared GPEs
      PCI PM: Make it possible to force using INTx for PCIe PME signaling
      PCI PM: PCIe PME root port service driver
      PCI PM: Add function for checking PME status of devices
      PCI: mark is_pcie obsolete
      PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges
      PCI: pciehp: second try to get big range for pcie devices
      ...
    torvalds authored
  2. Linus Torvalds

    Lower USB storage settling delay to something more reasonable

    The five-second delay can be rather annoying, and makes the system
    appear much less responsive when you connect a USB drive.
    
    It's also not entirely clear that it is needed - the settling delay has
    at least historically been an issue on some Apple iPods, for example,
    and some devices have been reported to need even more than the old 5s
    delay.
    
    But before we penalize them all, let's see how bad it really is.  Some
    of the reasons for long delays seem to be actual historical kernel bugs
    that should probably never have been papered over with a delay in the
    first place (there's a Ubuntu bug report for 2.6.20 about a NULL pointer
    dereference unless 'delay_use' is 8 or more, for example).
    
    It also looks like some distros have already shipped with delay_use=0,
    so the five second default may well be totally historical.
    
    In other words: "Let's see if anybody screams".
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds authored

Feb 25, 2010

  1. Linus Torvalds

    Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

    * '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()
      ...
    torvalds authored
  2. Linus Torvalds

    Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

    * '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()
      ...
    torvalds authored
  3. Linus Torvalds

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

    …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
    torvalds authored
  4. Linus Torvalds

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

    …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
    torvalds authored
  5. Linus Torvalds

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

    …/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
      ...
    torvalds authored
  6. Merge branches 'upstream', 'raw_report_modifications' and 'apple_magi…

    …c_mouse' into for-linus
    
    Conflicts:
    	drivers/hid/Kconfig
    Jiri Kosina authored
  7. x86/PCI: Prevent mmconfig memory corruption

    commit ff097dd (x86/PCI: MMCONFIG: manage pci_mmcfg_region as a
    list, not a table) introduced a nasty memory corruption when
    pci_mmcfg_list is empty.
    
    pci_mmcfg_check_end_bus_number() dereferences pci_mmcfg_list.prev even
    when the list is empty. The following write hits some variable near to
    pci_mmcfg_list.
    
    Further down a similar problem exists, where cfg->list.next is
    dereferenced unconditionally and a comparison with some variable near
    to pci_mmcfg_list happens.
    
    Add a check for the last element into the for_each_entry() loop and
    remove all the other crappy logic which is just a leftover of the old
    array based code which was replaced by the list conversion.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: stable@kernel.org
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Thomas Gleixner authored Jesse Barnes committed
  8. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    …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
      ...
    torvalds authored
  9. Linus Torvalds

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

    …/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
    torvalds authored
  10. netlabel: fix export of SELinux categories > 127

    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>
    Joshua Roys authored James Morris committed
  11. Linus Torvalds

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

    …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
    torvalds authored
  12. robhancock

    ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI

    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
    robhancock authored Jeff Garzik committed

Feb 24, 2010

  1. Rafael J. Wysocki

    ACPI: Use GPE reference counting to support shared GPEs

    To fix a bug and address the reviewers' comments regarding the ACPI
    GPE refcounting patch, do the following additional changes:
    
    o Remove the second argument of acpi_ev_enable_gpe(),
      'write_to_hardware', because it is not necessary any more.
    
    o Add the "bad parameter" test against 'type' in
      acpi_enable_gpe() and acpi_disable_gpe().
    
    o Make acpi_enable_gpe() only check 'status' for runtime GPEs if
      acpi_ev_enable_gpe() was actually called.
    
    o Make acpi_disable_gpe() return 'status' returned by
      acpi_ev_disable_gpe() and fix a bug where ACPI_GPE_TYPE_WAKE
      and ACPI_GPE_TYPE_RUNTIME were exchanged by mistake.
    
    o Add comments explaining why acpi_set_gpe() is used by the ACPI EC
      driver.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    rjwysocki authored Jesse Barnes committed
  2. security: fix error return path in ima_inode_alloc

    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>
    Xiaotian Feng authored James Morris committed
  3. Linus Torvalds

    Linux 2.6.33

    torvalds authored
  4. Linus Torvalds

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

    …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.
    torvalds authored
  5. Linus Torvalds

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

    …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
    torvalds authored
  6. parisc: Set PCI CLS early in boot.

    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>
    Carlos O'Donell authored Kyle McMartin committed
  7. Linus 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: Fix out_le32() macro
      microblaze: Fix cache loop function for cache range
    torvalds authored
  8. Linus 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:
      Revert "block: improve queue_should_plug() by looking at IO depths"
    torvalds authored
  9. smagnani

    microblaze: Fix out_le32() macro

    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>
    smagnani authored michalsimek committed
  10. michalsimek

    microblaze: Fix cache loop function for cache range

    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>
    michalsimek authored
  11. Add MAINTAINERS entry for virtio_console

    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>
    Amit Shah authored rustyrussell committed
  12. virtio: console: Fill ports' entire in_vq with buffers

    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>
    Amit Shah authored rustyrussell committed
  13. virtio: console: Error out if we can't allocate buffers for control q…

    …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>
    Amit Shah authored rustyrussell committed
  14. virtio: console: Add ability to remove module

    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>
    Amit Shah authored rustyrussell committed
  15. virtio: console: Ensure no memleaks in case of unused buffers

    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>
    Amit Shah authored rustyrussell committed
  16. virtio: console: show error message if hvc_alloc fails for console ports

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

    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>
    Amit Shah authored rustyrussell committed
  18. virtio: console: Add ability to hot-unplug ports

    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>
    Amit Shah authored rustyrussell committed
  19. virtio: console: Handle port hot-plug

    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>
    Amit Shah authored rustyrussell committed
  20. virtio: console: Remove cached data on port close

    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>
    Amit Shah authored rustyrussell committed
  21. virtio: console: Register with sysfs and create a 'name' attribute fo…

    …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>
    Amit Shah authored rustyrussell committed
Something went wrong with that request. Please try again.