1. 06 12月, 2006 33 次提交
  2. 05 12月, 2006 7 次提交
    • M
      [PATCH] Centralise definitions of sector_t and blkcnt_t · e6243863
      Matthew Wilcox 提交于
      CONFIG_LBD and CONFIG_LSF are spread into asm/types.h for no particularly
      good reason.
      
      Centralising the definition in linux/types.h means that arch maintainers
      don't need to bother adding it, as well as fixing the problem with
      x86-64 users being asked to make a decision that has absolutely no
      effect.
      
      The H8/300 porters seem particularly confused since I'm not aware of any
      microcontrollers that need to support 2TB filesystems.
      Signed-off-by: NMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      e6243863
    • L
      Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block · 2d941e99
      Linus Torvalds 提交于
      * 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] blktrace: don't return blktrace_seq from trace_note()
        [PATCH] blktrace: uninline trace_note()
      2d941e99
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 651857a1
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits)
        ocfs2: implement i_op->permission
        configfs: make configfs_dirent_exists() static
        ocfs2: update file system paths to set atime
        ocfs2: core atime update functions
        ocfs2: Add splice support
        ocfs2: Remove ocfs2_write_should_remove_suid()
        [PATCH] Export should_remove_suid()
        configfs: mutex_lock_nested() fix
        ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t
        ocfs2: remove handle argument to ocfs2_start_trans()
        ocfs2: remove ocfs2_journal_handle journal field
        ocfs2: pass ocfs2_super * into ocfs2_commit_trans()
        ocfs2: remove unused handle argument from ocfs2_meta_lock_full()
        ocfs2: make ocfs2_alloc_handle() static
        ocfs2: remove unused ocfs2_handle_add_lock()
        ocfs2: remove unused ocfs2_handle_add_inode()
        ocfs2: Don't allocate handle early in ocfs2_rename()
        ocfs2: don't use handle for locking in allocation functions
        ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename()
        ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink()
        ...
      651857a1
    • A
      [PATCH] remote memory corruptor in ibmtr.c · ee28b0da
      Al Viro 提交于
      ip_summed changes last summer had missed that one.  As the result,
      we have ip_summed interpreted as CHECKSUM_PARTIAL now.  IOW,
      ->csum is interpreted as offset of checksum in the packet.  net/core/*
      will both read and modify the value as that offset, with obvious
      reasons.  At the very least it's a remote memory corruptor.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      ee28b0da
    • A
      [PATCH] selinux endianness annotations · 87fcd70d
      Al Viro 提交于
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      87fcd70d
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 91f433ca
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Cleanup memory barriers for weakly ordered systems.
        [MIPS] Alchemy: Automatically enable CONFIG_RESOURCES_64BIT for PCI configs.
        [MIPS] Unify csum_partial.S
        [MIPS] SWARM: Fix a typo in #error directives
        [MIPS] Fix atomic.h build errors.
        [MIPS] Use SYSVIPC_COMPAT to fix various problems on N32
        [MIPS] klconfig add missing bracket
      91f433ca
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 15a4cb9c
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (194 commits)
        [POWERPC] Add missing EXPORTS for mpc52xx support
        [POWERPC] Remove obsolete PPC_52xx and update CLASSIC32 comment
        [POWERPC] ps3: add a default zImage target
        [POWERPC] Add of_platform_bus support to mpc52xx psc uart driver
        [POWERPC] typo fix and whitespace cleanup on mpc52xx-uart driver
        [POWERPC] Fix debug printks for 32-bit resources in the PCI code
        [POWERPC] Replace kmalloc+memset with kzalloc
        [POWERPC] Linkstation / kurobox support
        [POWERPC] Add the e300c3 core to the CPU table.
        [POWERPC] ppc: m48t35 add missing bracket
        [POWERPC] iSeries: don't build head_64.o unnecessarily
        [POWERPC] iSeries: stop dt_mod.o being rebuilt unnecessarily
        [POWERPC] Fix cputable.h for combined build
        [POWERPC] Allow CONFIG_BOOTX_TEXT on iSeries
        [POWERPC] Allow xmon to build on legacy iSeries
        [POWERPC] Change ppc64_defconfig to use AUTOFS_V4 not V3
        [POWERPC] Tell firmware we can handle POWER6 compatible mode
        [POWERPC] Clean images in arch/powerpc/boot
        [POWERPC] Fix OF pci flags parsing
        [POWERPC] defconfig for lite5200 board
        ...
      15a4cb9c