1. 07 Aug, 2010 1 commit
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 3b7433b8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)
        workqueue: mark init_workqueues() as early_initcall()
        workqueue: explain for_each_*cwq_cpu() iterators
        fscache: fix build on !CONFIG_SYSCTL
        slow-work: kill it
        gfs2: use workqueue instead of slow-work
        drm: use workqueue instead of slow-work
        cifs: use workqueue instead of slow-work
        fscache: drop references to slow-work
        fscache: convert operation to use workqueue instead of slow-work
        fscache: convert object to use workqueue instead of slow-work
        workqueue: fix how cpu number is stored in work->data
        workqueue: fix mayday_mask handling on UP
        workqueue: fix build problem on !CONFIG_SMP
        workqueue: fix locking in retry path of maybe_create_worker()
        async: use workqueue for worker pool
        workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead
        workqueue: implement unbound workqueue
        workqueue: prepare for WQ_UNBOUND implementation
        libata: take advantage of cmwq and remove concurrency limitations
        workqueue: fix worker management invocation without pending works
        ...
      
      Fixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in
      include/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c
      3b7433b8
  2. 06 Aug, 2010 34 commits
  3. 05 Aug, 2010 5 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · fc1caf6e
      Linus Torvalds authored
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (204 commits)
        agp: intel-agp: do not use PCI resources before pci_enable_device()
        agp: efficeon-agp: do not use PCI resources before pci_enable_device()
        drm: kill BKL from common code
        drm/kms: Simplify setup of the initial I2C encoder config.
        drm,io-mapping: Specify slot to use for atomic mappings
        drm/radeon/kms: only expose underscan on avivo chips
        drm/radeon: add new pci ids
        drm: Cleanup after failing to create master->unique and dev->name
        drm/radeon: tone down overchatty acpi debug messages.
        drm/radeon/kms: enable underscan option for digital connectors
        drm/radeon/kms: fix calculation of h/v scaling factors
        drm/radeon/kms/igp: sideport is AMD only
        drm/radeon/kms: handle the case of no active displays properly in the bandwidth code
        drm: move ttm global code to core drm
        drm/i915: Clear the Ironlake dithering flags when the pipe doesn't want it.
        drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors
        drm/radeon/kms: make sure rio_mem is valid before unmapping it
        drm/agp/i915: trim stolen space to 32M
        drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
        drm/i915: Unreference object not handle on creation
        ...
      fc1caf6e
    • Linus Torvalds's avatar
      Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 9779714c
      Linus Torvalds authored
      * 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        kgdb,docs: Update the kgdb docs to include kms
        drm_fb_helper: Preserve capability to use atomic kms
        i915: when kgdb is active display compression should be off
        drm/i915: use new fb debug hooks
        drm: add KGDB/KDB support
        fb: add hooks to handle KDB enter/exit
        kgdboc: Add call backs to allow kernel mode switching
        vt,console,kdb: automatically set kdb LINES variable
        vt,console,kdb: implement atomic console enter/leave functions
      9779714c
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 89a6c8cb
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        debug_core,kdb: fix crash when arch does not have single step
        kgdb,x86: use macro HBP_NUM to replace magic number 4
        kgdb,mips: remove unused kgdb_cpu_doing_single_step operations
        mm,kdb,kgdb: Add a debug reference for the kdb kmap usage
        KGDB: Remove set but unused newPC
        ftrace,kdb: Allow dumping a specific cpu's buffer with ftdump
        ftrace,kdb: Extend kdb to be able to dump the ftrace buffer
        kgdb,powerpc: Replace hardcoded offset by BREAK_INSTR_SIZE
        arm,kgdb: Add ability to trap into debugger on notify_die
        gdbstub: do not directly use dbg_reg_def[] in gdb_cmd_reg_set()
        gdbstub: Implement gdbserial 'p' and 'P' packets
        kgdb,arm: Individual register get/set for arm
        kgdb,mips: Individual register get/set for mips
        kgdb,x86: Individual register get/set for x86
        kgdb,kdb: individual register set and and get API
        gdbstub: Optimize kgdb's "thread:" response for the gdb serial protocol
        kgdb: remove custom hex_to_bin()implementation
      89a6c8cb
    • Linus Torvalds's avatar
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 03c0c29a
      Linus Torvalds authored
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
        of/platform: Register of_platform_drivers with an "of:" prefix
        of/address: Clean up function declarations
        of/spi: call of_register_spi_devices() from spi core code
        of: Provide default of_node_to_nid() implementation.
        of/device: Make of_device_make_bus_id() usable by other code.
        of/irq: Fix endian issues in parsing interrupt specifiers
        of: Fix phandle endian issues
        of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
        of: remove of_default_bus_ids
        of: make of_find_device_by_node generic
        microblaze: remove references to of_device and to_of_device
        sparc: remove references to of_device and to_of_device
        powerpc: remove references to of_device and to_of_device
        of/device: Replace of_device with platform_device in includes and core code
        of/device: Protect against binding of_platform_drivers to non-OF devices
        of: remove asm/of_device.h
        of: remove asm/of_platform.h
        of/platform: remove all of_bus_type and of_platform_bus_type references
        of: Merge of_platform_bus_type with platform_bus_type
        drivercore/of: Add OF style matching to platform bus
        ...
      
      Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
      some obj-y removals by the devicetree branch, while the microblaze
      updates added a new file.
      03c0c29a
    • Linus Torvalds's avatar