1. 08 May, 2007 38 commits
  2. 07 May, 2007 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · a989705c
      Linus Torvalds authored
      * 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
    • Linus Torvalds's avatar
      Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux · 2d56d3c4
      Linus Torvalds authored
      * '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