1. 31 Dec, 2008 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · db5e53fb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: avoid leaking caches or refcounts on sysfs error
        slab: Fix comment on #endif
        slab: remove GFP_THISNODE clearing from alloc_slabmgmt()
        slub: Add might_sleep_if() to slab_alloc()
        SLUB: failslab support
        slub: Fix incorrect use of loose
        slab: Update the kmem_cache_create documentation regarding the name parameter
        slub: make early_kmem_cache_node_alloc void
        slab: unsigned slabp->inuse cannot be less than 0
        slub - fix get_object_page comment
        SLUB: Replace __builtin_return_address(0) with _RET_IP_.
        SLUB: cleanup - define macros instead of hardcoded numbers
      db5e53fb
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 3f4b5c5d
      Linus Torvalds authored
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (37 commits)
        drm/i915: fix modeset devname allocation + agp init return check.
        drm/i915: Remove redundant test in error path.
        drm: Add a debug node for vblank state.
        drm: Avoid use-before-null-test on dev in drm_cleanup().
        drm/i915: Don't print to dmesg when taking signal during object_pin.
        drm: pin new and unpin old buffer when setting a mode.
        drm/i915: un-EXPORT and make 'intelfb_panic' static
        drm/i915: Delete unused, pointless i915_driver_firstopen.
        drm/i915: fix sparse warnings: returning void-valued expression
        drm/i915: fix sparse warnings: move 'extern' decls to header file
        drm/i915: fix sparse warnings: make symbols static
        drm/i915: fix sparse warnings: declare one-bit bitfield as unsigned
        drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
        drm/i915: Fix fbcon setup to align display pitch to 64b.
        drm/i915: Add missing userland definitions for gem init/execbuffer.
        i915/drm: provide compat defines for userspace for certain struct members.
        drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well.
        drm: sanitise drm modesetting API + remove unused hotplug
        drm: fix allowing master ioctls on non-master fds.
        drm/radeon: use locked rmmap to remove sarea mapping.
        ...
      3f4b5c5d
    • Linus Torvalds's avatar
      Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 · a4ba2e9e
      Linus Torvalds authored
      * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
        agp/intel: Fix broken ® symbol in device name.
        agp/intel: add support for G41 chipset
      a4ba2e9e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · 6de71484
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (98 commits)
        sparc: move select of ARCH_SUPPORTS_MSI
        sparc: drop SUN_IO
        sparc: unify sections.h
        sparc: use .data.init_task section for init_thread_union
        sparc: fix array overrun check in of_device_64.c
        sparc: unify module.c
        sparc64: prepare module_64.c for unification
        sparc64: use bit neutral Elf symbols
        sparc: unify module.h
        sparc: introduce CONFIG_BITS
        sparc: fix hardirq.h removal fallout
        sparc64: do not export pus_fs_struct
        sparc: use sparc64 version of scatterlist.h
        sparc: Commonize memcmp assembler.
        sparc: Unify strlen assembler.
        sparc: Add asm/asm.h
        sparc: Kill memcmp_32.S code which has been ifdef'd out for centuries.
        sparc: replace for_each_cpu_mask_nr with for_each_cpu
        sparc: fix sparse warnings in irq_32.c
        sparc: add include guards to kernel.h
        ...
      6de71484
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block · 1dff81f2
      Linus Torvalds authored
      * 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block: (43 commits)
        bio: get rid of bio_vec clearing
        bounce: don't rely on a zeroed bio_vec list
        cciss: simplify parameters to deregister_disk function
        cfq-iosched: fix race between exiting queue and exiting task
        loop: Do not call loop_unplug for not configured loop device.
        loop: Flush possible running bios when loop device is released.
        alpha: remove dead BIO_VMERGE_BOUNDARY
        Get rid of CONFIG_LSF
        block: make blk_softirq_init() static
        block: use min_not_zero in blk_queue_stack_limits
        block: add one-hit cache for disk partition lookup
        cfq-iosched: remove limit of dispatch depth of max 4 times quantum
        nbd: tell the block layer that it is not a rotational device
        block: get rid of elevator_t typedef
        aio: make the lookup_ioctx() lockless
        bio: add support for inlining a number of bio_vecs inside the bio
        bio: allow individual slabs in the bio_set
        bio: move the slab pointer inside the bio_set
        bio: only mempool back the largest bio_vec slab cache
        block: don't use plugging on SSD devices
        ...
      1dff81f2
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · 179475a3
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, sparseirq: clean up Kconfig entry
        x86: turn CONFIG_SPARSE_IRQ off by default
        sparseirq: fix numa_migrate_irq_desc dependency and comments
        sparseirq: add kernel-doc notation for new member in irq_desc, -v2
        locking, irq: enclose irq_desc_lock_class in CONFIG_LOCKDEP
        sparseirq, xen: make sure irq_desc is allocated for interrupts
        sparseirq: fix !SMP building, #2
        x86, sparseirq: move irq_desc according to smp_affinity, v7
        proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ
        sparse irqs: add irqnr.h to the user headers list
        sparse irqs: handle !GENIRQ platforms
        sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ build
        sparseirq: fix Alpha build failure
        sparseirq: fix typo in !CONFIG_IO_APIC case
        x86, MSI: pass irq_cfg and irq_desc
        x86: MSI start irq numbering from nr_irqs_gsi
        x86: use NR_IRQS_LEGACY
        sparse irq_desc[] array: core kernel and x86 changes
        genirq: record IRQ_LEVEL in irq_desc[]
        irq.h: remove padding from irq_desc on 64bits
      179475a3
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of... · bb758e96
      Linus Torvalds authored
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimers: fix warning in kernel/hrtimer.c
        x86: make sure we really have an hpet mapping before using it
        x86: enable HPET on Fujitsu u9200
        linux/timex.h: cleanup for userspace
        posix-timers: simplify de_thread()->exit_itimers() path
        posix-timers: check ->it_signal instead of ->it_pid to validate the timer
        posix-timers: use "struct pid*" instead of "struct task_struct*"
        nohz: suppress needless timer reprogramming
        clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
        nohz: no softirq pending warnings for offline cpus
        hrtimer: removing all ur callback modes, fix
        hrtimer: removing all ur callback modes, fix hotplug
        hrtimer: removing all ur callback modes
        x86: correct link to HPET timer specification
        rtc-cmos: export second NVRAM bank
      
      Fixed up conflicts in sound/drivers/pcsp/pcsp.c and sound/core/hrtimer.c
      manually.
      bb758e96
    • Linus Torvalds's avatar
      Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 5f34fe1c
      Linus Torvalds authored
      * 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)
        stacktrace: provide save_stack_trace_tsk() weak alias
        rcu: provide RCU options on non-preempt architectures too
        printk: fix discarding message when recursion_bug
        futex: clean up futex_(un)lock_pi fault handling
        "Tree RCU": scalable classic RCU implementation
        futex: rename field in futex_q to clarify single waiter semantics
        x86/swiotlb: add default swiotlb_arch_range_needs_mapping
        x86/swiotlb: add default phys<->bus conversion
        x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
        x86: add swiotlb allocation functions
        swiotlb: consolidate swiotlb info message printing
        swiotlb: support bouncing of HighMem pages
        swiotlb: factor out copy to/from device
        swiotlb: add arch hook to force mapping
        swiotlb: allow architectures to override phys<->bus<->phys conversions
        swiotlb: add comment where we handle the overflow of a dma mask on 32 bit
        rcu: fix rcutorture behavior during reboot
        resources: skip sanity check of busy resources
        swiotlb: move some definitions to header
        swiotlb: allow architectures to override swiotlb pool allocation
        ...
      
      Fix up trivial conflicts in
        arch/x86/kernel/Makefile
        arch/x86/mm/init_32.c
        include/linux/hardirq.h
      as per Ingo's suggestions.
      5f34fe1c
  2. 29 Dec, 2008 32 commits