1. 31 Mar, 2006 32 commits
  2. 30 Mar, 2006 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · ce362c00
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (24 commits)
        [PARISC] Fix double free when removing HIL drivers
        [PARISC] Add atomic_sub_and_test
        [PARISC] Enabled some NLS modules in a500, b180 and c3000 defconfigs
        [PARISC] Kill duplicated EXPORT_SYMBOL warnings
        [PARISC] Move ioremap EXPORT_SYMBOL from parisc_ksyms.c
        [PARISC] Make local_t use atomic_long_t
        [PARISC] Update defconfigs
        [PARISC] Add PREEMPT support
        [PARISC] More useful readwrite lock helpers
        [PARISC] Convert HIL drivers to use input_allocate_device
        [PARISC] Fixup CONFIG_EISA a bit
        [PARISC] getsockopt should be ENTRY_COMP
        [PARISC] Remove obsolete CONFIG_DEBUG_IOREMAP
        [PARISC] Temporary FIXME for ioremapping EISA regions
        [PARISC] Enable ioremap functionality unconditionally
        [PARISC] Fix stifb with IOREMAP and a 64-bit kernel
        [PARISC] Add CONFIG_HPPA_IOREMAP to conditionally enable ioremap
        [PARISC] Add STRICT_MM_TYPECHECKS
        [PARISC] Fix IOREMAP with a 64-bit kernel
        [PARISC] Add parisc implementation of flush_kernel_dcache_page()
        ...
      ce362c00
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 064c94f9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mad: RMPP support for additional classes
        IB/mad: include GID/class when matching receives
        IB/mthca: Fix section mismatch problems
        IPoIB: Fix oops with raw sockets
        IB/mthca: Fix check of size in SRQ creation
        IB/srp: Fix unmapping of fake scatterlist
      064c94f9
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 256414de
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] sata_mv: three bug fixes
        [PATCH] libata: ata_dev_init_params() fixes
        [PATCH] libata: Fix interesting use of "extern" and also some bracketing
        [PATCH] libata: Simplex and other mode filtering logic
        [PATCH] libata - ATA is both ATA and CFA
        [PATCH] libata: Add ->set_mode hook for odd drivers
        [PATCH] libata: BMDMA handling updates
        [PATCH] libata: kill trailing whitespace
        [PATCH] libata: add FIXME above ata_dev_xfermask()
        [PATCH] libata: cosmetic changes in ata_bus_softreset()
        [PATCH] libata: kill E.D.D.
      256414de
    • Linus Torvalds's avatar
      Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 63e8d911
      Linus Torvalds authored
      * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: remove drm_{alloc,free}_pages
        drm: sis fix compile warning
        drm: add new radeon PCI ids..
        drm: read breadcrumb in IRQ handler
        drm: fixup i915 breadcrumb read/write
        drm:  remove pointless checks in radeon_state
        drm: fixup improper cast.
        drm: rationalise some pci ids
        drm: Add general-purpose packet for manipulating scratch registers (r300)
        drm: rework radeon memory map (radeon 1.23)
        drm: update r300 register names
        drm: fixup PCI DMA support
      63e8d911
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · d1127e40
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] ioremap() should prefer WB over UC
        [IA64] Add __mca_table to the DISCARD list in gate.lds
        [IA64] Move __mca_table out of the __init section
        [IA64] simplify some condition checks in iosapic_check_gsi_range
        [IA64] correct some messages and fixes some minor things
        [IA64-SGI] fix for-loop in sn_hwperf_geoid_to_cnode()
        [IA64-SGI] sn_hwperf use of num_online_cpus()
        [IA64] optimize flush_tlb_range on large numa box
        [IA64] lazy_mmu_prot_update needs to be aware of huge pages
      d1127e40
    • Jens Axboe's avatar
      [PATCH] splice: add support for SPLICE_F_MOVE flag · 5abc97aa
      Jens Axboe authored
      This enables the caller to migrate pages from one address space page
      cache to another.  In buzz word marketing, you can do zero-copy file
      copies!
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      5abc97aa
    • Jens Axboe's avatar
      [PATCH] Introduce sys_splice() system call · 5274f052
      Jens Axboe authored
      This adds support for the sys_splice system call. Using a pipe as a
      transport, it can connect to files or sockets (latter as output only).
      
      From the splice.c comments:
      
         "splice": joining two ropes together by interweaving their strands.
      
         This is the "extended pipe" functionality, where a pipe is used as
         an arbitrary in-memory buffer. Think of a pipe as a small kernel
         buffer that you can use to transfer data from one end to the other.
      
         The traditional unix read/write is extended with a "splice()" operation
         that transfers data buffers to or from a pipe buffer.
      
         Named by Larry McVoy, original implementation from Linus, extended by
         Jens to support splicing to files and fixing the initial implementation
         bugs.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      5274f052
    • Kyle McMartin's avatar
      [PARISC] Fix double free when removing HIL drivers · cd7a9202
      Kyle McMartin authored
      On Thu, Mar 30, 2006 at 08:31:02AM -0500, Dmitry Torokhov wrote:
      > Don't do that, its double free. input_unregister_device() normally
      > causes release() to be called and free the device. input_free_device
      > is only to be called when input_register_device has not been called or
      > failed.
      >
      > Plus you might want to unregister device after closing serio port,
      > otherwise your interrupt routine might be referencing already freed
      > memory.
      Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
      cd7a9202