1. 09 5月, 2007 31 次提交
  2. 08 5月, 2007 9 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 5b94f675
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SCSI] esp_scsi: Fix section mismatch warnings.
        [VIDEO] sunxvr2500: Fix PCI device ID table.
      5b94f675
    • L
      Fix bluetooth HCI sysfs compile · d12db0b0
      Linus Torvalds 提交于
      More fallout from the removal of "struct subsystem" from the core device
      model.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d12db0b0
    • M
    • D
      [VIDEO] sunxvr2500: Fix PCI device ID table. · de9f0cf9
      David S. Miller 提交于
      Noticed by Meelis Roos.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      de9f0cf9
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · a989705c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] update memory attribute aliasing documentation & test cases
        [IA64] fail mmaps that span areas with incompatible attributes
        [IA64] allow WB /sys/.../legacy_mem mmaps
        [IA64] make ioremap avoid unsupported attributes
        [IA64] rename ioremap variables to match i386
        [IA64] relax per-cpu TLB requirement to DTC
        [IA64] remove per-cpu ia64_phys_stacked_size_p8
        [IA64] Fix example error injection program
        [IA64] Itanium MC Error Injection Tool: pal_mc_error_inject() interface
        [IA64] Itanium MC Error Injection Tool: Makefile changes
        [IA64] Itanium MC Error Injection Tool: Driver sysfs interface
        [IA64] Itanium MC Error Injection Tool: Doc and sample application
        [IA64] Itanium MC Error Injection Tool: Kernel configuration
      a989705c
    • L
      Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux · 2d56d3c4
      Linus Torvalds 提交于
      * 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux:
        gfs2: nfs lock support for gfs2
        lockd: add code to handle deferred lock requests
        lockd: always preallocate block in nlmsvc_lock()
        lockd: handle test_lock deferrals
        lockd: pass cookie in nlmsvc_testlock
        lockd: handle fl_grant callbacks
        lockd: save lock state on deferral
        locks: add fl_grant callback for asynchronous lock return
        nfsd4: Convert NFSv4 to new lock interface
        locks: add lock cancel command
        locks: allow {vfs,posix}_lock_file to return conflicting lock
        locks: factor out generic/filesystem switch from setlock code
        locks: factor out generic/filesystem switch from test_lock
        locks: give posix_test_lock same interface as ->lock
        locks: make ->lock release private data before returning in GETLK case
        locks: create posix-to-flock helper functions
        locks: trivial removal of unnecessary parentheses
      2d56d3c4
    • L
      Fix up SLUB compile · 0f9008ef
      Linus Torvalds 提交于
      The newly merged SLUB allocator patches had been generated before the
      removal of "struct subsystem", and ended up applying fine, but wouldn't
      build based on the current tree as a result.
      
      Fix up that merge error - not that SLUB is likely really ready for
      showtime yet, but at least I can fix the trivial stuff.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0f9008ef
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 5cefcab3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (34 commits)
        [GFS2] Uncomment sprintf_symbol calling code
        [DLM] lowcomms style
        [GFS2] printk warning fixes
        [GFS2] Patch to fix mmap of stuffed files
        [GFS2] use lib/parser for parsing mount options
        [DLM] Lowcomms nodeid range & initialisation fixes
        [DLM] Fix dlm_lowcoms_stop hang
        [DLM] fix mode munging
        [GFS2] lockdump improvements
        [GFS2] Patch to detect corrupt number of dir entries in leaf and/or inode blocks
        [GFS2] bz 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump)
        [DLM] fs/dlm/ast.c should #include "ast.h"
        [DLM] Consolidate transport protocols
        [DLM] Remove redundant assignment
        [GFS2] Fix bz 234168 (ignoring rgrp flags)
        [DLM] change lkid format
        [DLM] interface for purge (2/2)
        [DLM] add orphan purging code (1/2)
        [DLM] split create_message function
        [GFS2] Set drop_count to 0 (off) by default
        ...
      5cefcab3
    • L
      Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5f757f91
      Linus Torvalds 提交于
      * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/i915: Add 965GM pci id update
        drm: just use io_remap_pfn_range on all archs..
        drm: fix DRM_CONSISTENT mapping
        drm: fix up mmap locking in preparation for ttm changes
        drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
        drm: fix warning in drm_fops.c
        drm: allow for more generic drm ioctls
        drm: fix alpha domain handling
        via: fix CX700 pci id
        drm: make drm_io_prot static.
        drm: remove via_mm.h
        drm: add missing NULL assignment
        drm/radeon: Fix u32 overflows when determining AGP base address in card space.
        drm: port over use_vmalloc code from git hashtab
        drm: fix crash with fops lock and fixup sarea/page size locking
        drm: bring bufs code from git tree.
        drm: move protection stuff into separate function
        drm: Use ARRAY_SIZE macro when appropriate
        drm: update README.drm (bugzilla #7933)
        drm: remove unused exports
      5f757f91