1. 24 Sep, 2006 4 commits
    • David Woodhouse's avatar
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · b7a818e4
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (28 commits)
        ocfs2: Teach ocfs2_drop_lock() to use ->set_lvb() callback
        ocfs2: Remove ->unblock lockres operation
        ocfs2: move downconvert worker to lockres ops
        ocfs2: Remove unused dlmglue functions
        ocfs2: Have the metadata lock use generic dlmglue functions
        ocfs2: Add ->set_lvb callback in dlmglue
        ocfs2: Add ->check_downconvert callback in dlmglue
        ocfs2: Check for refreshing locks in generic unblock function
        ocfs2: don't unconditionally pass LVB flags
        ocfs2: combine inode and generic blocking AST functions
        ocfs2: Add ->get_osb() dlmglue locking operation
        ocfs2: remove ->unlock_ast() callback from ocfs2_lock_res_ops
        ocfs2: combine inode and generic AST functions
        ocfs2: Clean up lock resource refresh flags
        ocfs2: Remove i_generation from inode lock names
        ocfs2: Encode i_generation in the meta data lvb
        ocfs2: Free up some space in the lvb
        ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock()
        ocfs2: manually d_move() during ocfs2_rename()
        [PATCH] Allow file systems to manually d_move() inside of ->rename()
        ...
      b7a818e4
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/khdrs-2.6 · 398477d4
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/khdrs-2.6:
        New 'make headers_install_all' target.
        Use dependencies for 'make headers_install'.
        [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.
        Remove dead netfilter_logging.h from include/linux/Kbuild
        Remove offsetof() from user-visible <linux/stddef.h>
        Clean up exported headers on CRIS
        Fix v850 exported headers
        Don't advertise (or allow) headers_{install,check} where inappropriate.
        Remove UML header export
        Remove ARM26 header export.
        Fix H8300 exported headers.
        Fix m68knommu exported headers
        Fix exported headers for SPARC, SPARC64
        Fix 'make headers_check' on m32r
        Fix 'make headers_check' on sh64
        Fix 'make headers_check' on sh
        [HEADERS] Fix ARM 'make headers_check'
      
      Initial pass of manual conflict resolution in top-level Makefile over
      conflicting build rule and headers_install changes.
      398477d4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 6e936d3e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (28 commits)
        kbuild: add distclean info to 'make help' and more details for 'clean'
        dontdiff: add utsrelease.h
        kbuild: fix "mkdir -p" usage in scripts/package/mkspec
        kbuild: correct and clarify versioning info in Makefile
        kbuild: fixup Documentation/kbuild/modules.txt
        kbuild: Extend kbuild/defconfig tags support to exuberant ctags
        kbuild: fix for some typos in Documentation/makefiles.txt
        kbuild: clarify "make C=" build option
        Documentaion: update Documentation/Changes with minimum versions
        kbuild: update help in top level Makefile
        kbuild: fail kernel compilation in case of unresolved module symbols
        kbuild: remove debug left-over from Makefile.host
        kbuild: create output directory for hostprogs with O=.. build
        kbuild: add missing return statement in modpost.c:secref_whitelist()
        kbuild: preperly align SYSMAP output
        kbuild: make -rR is now default
        kbuild: make V=2 tell why a target is rebuild
        kbuild: modpost on vmlinux regardless of CONFIG_MODULES
        kbuild: ignore references from ".pci_fixup" to ".init.text"
        kbuild: linguistic fixes for Documentation/kbuild/makefiles.txt
        ...
      6e936d3e
  2. 25 Sep, 2006 28 commits
  3. 24 Sep, 2006 8 commits