1. 08 Feb, 2007 18 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 · 0c0e8caf
      Linus Torvalds authored
      * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Allow for 44 bit user-tokens (or drm_file offsets)
        drm/via: Disable AGP DMA for chips with the new 3D engine.
        drm: update core memory manager from git drm tree
        drm: remove drm_ioremap and drm_ioremapfree
        i810/i830: use drm_core_ioremap instead of drm_ioremap
        drm: use vmalloc_user instead of vmalloc_32 for DRM_SHM
        via: allow for npot texture pitch alignment
        via: add some new chipsets
        via: some PCI posting flushes
      0c0e8caf
    • Linus Torvalds's avatar
      kbuild: fix space for good (take 103) · b892afd1
      Linus Torvalds authored
      Michal Ostrowski points out what the real problem was: the spaces at the
      start of the definition of the 'checker-shell' make function.
      
      Cc: Michal Ostrowski <mostrows@watson.ibm.com>
      Acked-by: default avatarDavid Miller <davem@davemloft.net>
      Acked-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
      Acked-by: default avatarOleg Verych <olecom@flower.upol.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b892afd1
    • Thomas Hellstrom's avatar
    • Linus Torvalds's avatar
      kbuild: make $(checker-shell ) strip spaces around the result · c4184f11
      Linus Torvalds authored
      It looks like GNU make version 3.80 (but apparently not 3.81) adds
      leading whitespace to the result of the checker-shell execution.  This
      strips them off explicitly.
      
      Also, don't bother symlinking the output file to /dev/null.  It's likely
      as expensive as just writing the temp-file, and we need to remove it
      anyway afterwards.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c4184f11
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 905adce4
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
        ide-acpi support warning fix
        ACPI support for IDE devices
        IDE Driver for Delkin/Lexar/etc.. cardbus CF adapter
        ide: it8213 IDE driver update (version 2)
        ide: add it8213 IDE driver
        tc86c001: add missing __init tag for tc86c001_ide_init()
        tc86c001: mark init_chipset_tc86c001() with __devinit tag
        tc86c001: init_hwif_tc86c001() can be static
        ide: add Toshiba TC86C001 IDE driver (take 2)
        pdc202xx_new: remove check_in_drive_lists abomination
        pdc202xx_new: remove useless code
        slc90e66: carry over fixes from piix driver
        piix: tuneproc() fixes/cleanups
        piix: fix 82371MX enablebits
        hpt366: HPT36x PCI clock detection fix
        hpt366: init code rewrite
        hpt366: clean up DMA timeout handling for HPT370
        hpt366: merge HPT37x speedproc handlers
        hpt366: cache channel's MCR address
        hpt366: switch to using pci_get_slot
        ...
      905adce4
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 78149df6
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (41 commits)
        Revert "PCI: remove duplicate device id from ata_piix"
        msi: Make MSI useable more architectures
        msi: Kill the msi_desc array.
        msi: Remove attach_msi_entry.
        msi: Fix msi_remove_pci_irq_vectors.
        msi: Remove msi_lock.
        msi: Kill msi_lookup_irq
        MSI: Combine pci_(save|restore)_msi/msix_state
        MSI: Remove pci_scan_msi_device()
        MSI: Replace pci_msi_quirk with calls to pci_no_msi()
        PCI: remove duplicate device id from ipr
        PCI: remove duplicate device id from ata_piix
        PCI: power management: remove noise on non-manageable hw
        PCI: cleanup MSI code
        PCI: make isa_bridge Alpha-only
        PCI: remove quirk_sis_96x_compatible()
        PCI: Speed up the Intel SMBus unhiding quirk
        PCI Quirk: 1k I/O space IOBL_ADR fix on P64H2
        shpchp: delete trailing whitespace
        shpchp: remove DBG_XXX_ROUTINE
        ...
      78149df6
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c96e2c92
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (70 commits)
        USB: remove duplicate device id from zc0301
        USB: remove duplicate device id from usb_storage
        USB: remove duplicate device id from keyspan
        USB: remove duplicate device id from ftdi_sio
        USB: remove duplicate device id from visor
        USB: a bit more coding style cleanup
        usbcore: trivial whitespace fixes
        usb-storage: use first bulk endpoints, not last
        EHCI: fix interrupt-driven remote wakeup
        USB: switch ehci-hcd to new polling scheme
        USB: autosuspend for usb printer driver
        USB Input: Added kernel module to support all GTCO CalComp USB InterWrite School products
        USB: Sierra Wireless auto set D0
        USB: usb ethernet gadget recognizes HUSB2DEV
        USB: list atmel husb2_udc gadget controller
        USB: gadgetfs AIO tweaks
        USB: gadgetfs behaves better on userspace init bug
        USB: gadgetfs race fix
        USB: gadgetfs simplifications
        USB: gadgetfs cleanups
        ...
      c96e2c92
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · f2aca47d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (28 commits)
        sysfs: Shadow directory support
        Driver Core: Increase the default timeout value of the firmware subsystem
        Driver core: allow to delay the uevent at device creation time
        Driver core: add device_type to struct device
        Driver core: add uevent vars for devices of a class
        SYSFS: Fix missing include of list.h in sysfs.h
        HOWTO: Add a reference to Harbison and Steele
        sysfs: error handling in sysfs, fill_read_buffer()
        kobject: kobject_put cleanup
        sysfs: kobject_put cleanup
        sysfs: suppress lockdep warnings
        Driver core: fix race in sysfs between sysfs_remove_file() and read()/write()
        driver core: Change function call order in device_bind_driver().
        driver core: Don't stop probing on ->probe errors.
        driver core fixes: device_register() retval check in platform.c
        driver core fixes: make_class_name() retval checks
        /sys/modules/*/holders
        USB: add the sysfs driver name to all modules
        SERIO: add the sysfs driver name to all modules
        PCI: add the sysfs driver name to all modules
        ...
      f2aca47d
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 7677ced4
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
        sk98lin: planned removal
        AT91: MACB support
        sky2: version 1.12
        sky2: add new chip ids
        sky2: Yukon Extreme support
        sky2: safer transmit timeout
        sky2: TSO support for EC_U
        sky2: use dev_err for error reports
        sky2: add Wake On Lan support
        fix unaligned exception in /drivers/net/wireless/orinoco.c
        Remove unused kernel config option DLCI_COUNT
        z85230: spinlock logic
        mips: declance: Driver model for the PMAD-A
        Spidernet: Rework RX linked list
        NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
        NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
        hp100: convert pci_module_init() to pci_register_driver()
        NetXen: Added ethtool support for user level tools.
        NetXen: Firmware crb init changes.
        maintainers: add atl1 maintainers
        ...
      7677ced4
    • Thomas Hellstrom's avatar
    • Thomas Hellstrom's avatar
      drm: update core memory manager from git drm tree · 1d58420b
      Thomas Hellstrom authored
      Remove the memory manager parameter from the put_block function, as this
      makes the client code a lot cleaner. Prepare buffer manager for lock and
      unlock calls.
      Fix buggy aligned allocations.
      Remove the stupid root_node field from the core memory manager.
      Support multi-page buffer offset alignments
      Add improved alignment functionality to the core memory manager.
      This makes an allocated block actually align itself and returns any
      wasted space to the manager.
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      1d58420b
    • Christoph Hellwig's avatar
      drm: remove drm_ioremap and drm_ioremapfree · 004a7727
      Christoph Hellwig authored
      hch originally submitted this for paravirt ops work, airlied took it
      and cleaned up a lot of unused code caused by using this.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      004a7727
    • Dave Airlie's avatar
      i810/i830: use drm_core_ioremap instead of drm_ioremap · b9094d3a
      Dave Airlie authored
      This makes the i810/i830 use the drm_core_ioremap functions.
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      b9094d3a
    • Thomas Hellstrom's avatar
    • Thomas Hellstrom's avatar
      9b8d9d0e
    • Thomas Hellstrom's avatar
      via: add some new chipsets · 689692e7
      Thomas Hellstrom authored
      Disable 3D functionality and AGP DMA for chipsets with the DX9 3D engine.
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      689692e7
    • Thomas Hellstrom's avatar
      via: some PCI posting flushes · 76f62551
      Thomas Hellstrom authored
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      76f62551
    • Greg Kroah-Hartman's avatar
      Revert "PCI: remove duplicate device id from ata_piix" · 14719f32
      Greg Kroah-Hartman authored
      This reverts commit b1105635.
      
      It was incorrect, the proper fix is coming through the SATA tree, sorry
      about that.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      14719f32
  2. 07 Feb, 2007 22 commits