1. 07 Jan, 2009 11 commits
    • Eric Anholt's avatar
      drm/i915: Don't allow objects to get bound while VT switched. · 9bb2d6f9
      Eric Anholt authored
      This avoids a BUG_ON in the enter_vt path due to objects being in the GTT
      when we shouldn't have ever let them be (as we're not supposed to touch the
      device during that time).
      
      This was triggered by a change in the 2D driver to use the GTT mapping of
      objects after pinning them to improve software fallback performance.
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      9bb2d6f9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · c861ea2c
      Linus Torvalds authored
      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:
        CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3]
        Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"
        SELinux: shrink sizeof av_inhert selinux_class_perm and context
        CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]
        keys: fix sparse warning by adding __user annotation to cast
        smack: Add support for unlabeled network hosts and networks
        selinux: Deprecate and schedule the removal of the the compat_net functionality
        netlabel: Update kernel configuration API
      c861ea2c
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · 3610639d
      Linus Torvalds authored
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimer: splitout peek ahead functionality, fix
        hrtimer: fixup comments
        hrtimer: fix recursion deadlock by re-introducing the softirq
        hrtimer: simplify hotplug migration
        hrtimer: fix HOTPLUG_CPU=n compile warning
        hrtimer: splitout peek ahead functionality
      3610639d
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · cfa97f99
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: fix section mismatch
        sched: fix double kfree in failure path
        sched: clean up arch_reinit_sched_domains()
        sched: mark sched_create_sysfs_power_savings_entries() as __init
        getrusage: RUSAGE_THREAD should return ru_utime and ru_stime
        sched: fix sched_slice()
        sched_clock: prevent scd->clock from moving backwards, take #2
        sched: sched.c declare variables before they get used
      cfa97f99
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · 7238eb4c
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: provide irq_to_desc() to non-genirq architectures too
      7238eb4c
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus' of... · f94181da
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: fix rcutorture bug
        rcu: eliminate synchronize_rcu_xxx macro
        rcu: make treercu safe for suspend and resume
        rcu: fix rcutree grace-period-latency bug on small systems
        futex: catch certain assymetric (get|put)_futex_key calls
        futex: make futex_(get|put)_key() calls symmetric
        locking, percpu counters: introduce separate lock classes
        swiotlb: clean up EXPORT_SYMBOL usage
        swiotlb: remove unnecessary declaration
        swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h
        swiotlb: add support for systems with highmem
        swiotlb: store phys address in io_tlb_orig_addr array
        swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()
      f94181da
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 932adbed
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: Fix SND_SOC_ALL_CODECS handling of dual SPI and I2C control buses
        ASoC: Use snd_soc_dapm_nc_pin() in at91sam9g20ek
        ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
        ASoC: New enum type: value_enum
        pxa2xx-ac97: switch AC unit to correct state before probing
        ASoC: Clocking fixes for davinci-evm.c
        ASoC: Mark non-connected TWL4030 pins for pandora
        ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
      932adbed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · ce519e23
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (237 commits)
        Staging: android: binder: fix build errors
        Staging: android: add lowmemorykiller driver
        Staging: android: remove dummy android.c driver
        Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio
        Staging: android: add timed_gpio driver
        Staging: android: add ram_console driver
        Staging: android: add logging driver
        staging: android: binder: Fix use of euid
        Staging: android: binder: Fix gcc warnings about improper format specifiers for size_t in printk
        Staging: android: add binder driver
        Staging: add android framework
        Staging: epl: fix netdev->priv b0rkage
        Staging: epl: hr timers all run in hard irq context now
        Staging: epl: run Lindent on *.c files
        Staging: epl: run Lindent on *.h files
        Staging: epl: run Lindent on all user/*.h files
        Staging: epl: run Lindent on all kernel/*.h files
        Staging: add epl stack
        Staging: frontier: fix compiler warnings
        Staging: frontier: remove unused alphatrack_sysfs.c file
        ...
      ce519e23
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · 40d7ee5d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
        uio: make uio_info's name and version const
        UIO: Documentation for UIO ioport info handling
        UIO: Pass information about ioports to userspace (V2)
        UIO: uio_pdrv_genirq: allow custom irq_flags
        UIO: use pci_ioremap_bar() in drivers/uio
        arm: struct device - replace bus_id with dev_name(), dev_set_name()
        libata: struct device - replace bus_id with dev_name(), dev_set_name()
        avr: struct device - replace bus_id with dev_name(), dev_set_name()
        block: struct device - replace bus_id with dev_name(), dev_set_name()
        chris: struct device - replace bus_id with dev_name(), dev_set_name()
        dmi: struct device - replace bus_id with dev_name(), dev_set_name()
        gadget: struct device - replace bus_id with dev_name(), dev_set_name()
        gpio: struct device - replace bus_id with dev_name(), dev_set_name()
        gpu: struct device - replace bus_id with dev_name(), dev_set_name()
        hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
        i2o: struct device - replace bus_id with dev_name(), dev_set_name()
        IA64: struct device - replace bus_id with dev_name(), dev_set_name()
        i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
        infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
        ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
        ...
      40d7ee5d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 5fec8bdb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: clean up annotations of fc->lock
        fuse: fix sparse warning in ioctl
        fuse: update interface version
        fuse: add fuse_conn->release()
        fuse: separate out fuse_conn_init() from new_conn()
        fuse: add fuse_ prefix to several functions
        fuse: implement poll support
        fuse: implement unsolicited notification
        fuse: add file kernel handle
        fuse: implement ioctl support
        fuse: don't let fuse_req->end() put the base reference
        fuse: move FUSE_MINOR to miscdevice.h
        fuse: style fixes
      5fec8bdb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 59e3af21
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (41 commits)
        scc_pata: make use of scc_dma_sff_read_status()
        ide-dma-sff: factor out ide_dma_sff_write_status()
        ide: move read_sff_dma_status() method to 'struct ide_dma_ops'
        ide: don't set hwif->dma_ops in init_dma() method
        Resurrect IT8172 IDE controller driver
        piix: sync ich_laptop[] with ata_piix.c
        ide: update warm-plug HOWTO
        ide: fix ide_port_scan() to do ACPI setup after initializing request queues
        ide: remove now redundant ->cur_dev checks
        ide: remove unused ide_hwif_t.sg_mapped field
        ide: struct ide_atapi_pc - remove unused fields and update documentation
        ide: remove superfluous hwif variable assignment from ide_timer_expiry()
        ide: use ide_pci_is_in_compatibility_mode() helper in setup-pci.c
        ide: make "paranoia" ->handler check in ide_intr() more strict
        ide-cd: convert to ide-atapi facilities
        ide-cd: start DMA before sending the actual packet command
        ide-cd: wait for DRQ to get set per default
        ide: Fix drive's DWORD-IO handling
        ide: add port and host iterators
        ide: dynamic allocation of device structures
        ...
      59e3af21
  2. 06 Jan, 2009 29 commits