1. 22 Oct, 2010 2 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · f3270b16
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (48 commits)
        ocfs2: Avoid to evaluate xattr block flags again.
        ocfs2/cluster: Release debugfs file elapsed_time_in_ms
        ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.
        Initialize max_slots early
        When I tried to compile I got the following warning: fs/ocfs2/slot_map.c: In function ‘ocfs2_init_slot_info’: fs/ocfs2/slot_map.c:360: warning: ‘bytes’ may be used uninitialized in this function fs/ocfs2/slot_map.c:360: note: ‘bytes’ was declared here Compiler: gcc version 4.4.3 (GCC) on Mandriva I'm not sure why this warning occurs, I think compiler don't know that variable "bytes" is initialized when it is sent by reference to ocfs2_slot_map_physical_size and it throws that ugly warning. However, a simple initialization of "bytes" variable with 0 will fix it.
        ocfs2: validate bg_free_bits_count after update
        ocfs2/cluster: Bump up dlm protocol to version 1.1
        ocfs2/cluster: Show per region heartbeat elapsed time
        ocfs2/cluster: Add mlogs for heartbeat up/down events
        ocfs2/cluster: Create debugfs dir/files for each region
        ocfs2/cluster: Create debugfs files for live, quorum and failed region bitmaps
        ocfs2/cluster: Maintain bitmap of failed regions
        ocfs2/cluster: Maintain bitmap of quorum regions
        ocfs2/cluster: Track bitmap of live heartbeat regions
        ocfs2/cluster: Track number of global heartbeat regions
        ocfs2/cluster: Maintain live node bitmap per heartbeat region
        ocfs2/cluster: Reorganize o2hb debugfs init
        ocfs2/cluster: Check slots for unconfigured live nodes
        ocfs2/cluster: Print messages when adding/removing nodes
        ocfs2/cluster: Print messages when adding/removing heartbeat regions
        ...
      f3270b16
    • Linus Torvalds's avatar
      Merge branch 'core-memblock-for-linus' of... · 3044100e
      Linus Torvalds authored
      Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
        x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S
        xen: Cope with unmapped pages when initializing kernel pagetable
        memblock, bootmem: Round pfn properly for memory and reserved regions
        memblock: Annotate memblock functions with __init_memblock
        memblock: Allow memblock_init to be called early
        memblock/arm: Fix memblock_region_is_memory() typo
        x86, memblock: Remove __memblock_x86_find_in_range_size()
        memblock: Fix wraparound in find_region()
        x86-32, memblock: Make add_highpages honor early reserved ranges
        x86, memblock: Fix crashkernel allocation
        arm, memblock: Fix the sparsemem build
        memblock: Fix section mismatch warnings
        powerpc, memblock: Fix memblock API change fallout
        memblock, microblaze: Fix memblock API change fallout
        x86: Remove old bootmem code
        x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
        x86: Remove not used early_res code
        x86, memblock: Replace e820_/_early string with memblock_
        x86: Use memblock to replace early_res
        x86, memblock: Use memblock_debug to control debug message print out
        ...
      
      Fix up trivial conflicts in arch/x86/kernel/setup.c and kernel/Makefile
      3044100e
  2. 21 Oct, 2010 38 commits