1. 30 1月, 2008 32 次提交
  2. 29 1月, 2008 8 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25 · 0ba6c33b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
        [IPV6] ADDRLABEL: Fix double free on label deletion.
        [PPP]: Sparse warning fixes.
        [IPV4] fib_trie: remove unneeded NULL check
        [IPV4] fib_trie: More whitespace cleanup.
        [NET_SCHED]: Use nla_policy for attribute validation in ematches
        [NET_SCHED]: Use nla_policy for attribute validation in actions
        [NET_SCHED]: Use nla_policy for attribute validation in classifiers
        [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
        [NET_SCHED]: sch_api: introduce constant for rate table size
        [NET_SCHED]: Use typeful attribute parsing helpers
        [NET_SCHED]: Use typeful attribute construction helpers
        [NET_SCHED]: Use NLA_PUT_STRING for string dumping
        [NET_SCHED]: Use nla_nest_start/nla_nest_end
        [NET_SCHED]: Propagate nla_parse return value
        [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
        [NET_SCHED]: act_api: use nlmsg_parse
        [NET_SCHED]: act_api: fix netlink API conversion bug
        [NET_SCHED]: sch_netem: use nla_parse_nested_compat
        [NET_SCHED]: sch_atm: fix format string warning
        [NETNS]: Add namespace for ICMP replying code.
        ...
      0ba6c33b
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 21af0297
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (68 commits)
        [MIPS] remove Documentation/mips/GT64120.README
        [MIPS] Malta: remaining bits of the board support code cleanup
        [MIPS] Malta: make the helper function static
        [MIPS] Malta: fix braces at single statement blocks
        [MIPS] Malta, Atlas: move an extern function declaration to the header file
        [MIPS] Malta: Use C89 style for comments
        [MIPS] Malta: else should follow close brace in malta_int.c
        [MIPS] Malta: remove a superfluous comment
        [MIPS] Malta: include <linux/cpu.h> instead of <asm/cpu.h>
        [MIPS] Malta, Atlas, Sead: remove an extern from .c files
        [MIPS] Malta: fix oversized lines in malta_int.c
        [MIPS] Malta: remove a dead function declaration
        [MIPS] Malta: use tabs not spaces
        [MIPS] Malta: set up the screen info in a separate function
        [MIPS] Malta: check the PCI clock frequency in a separate function
        [MIPS] Malta: use the KERN_ facility level in printk()
        [MIPS] Malta: use Linux kernel style for structure initialization
        [MIPS]: constify function pointer tables
        [MIPS] compat: handle argument endianess of sys32_(f)truncate64 with merge_64
        [MIPS] Cobalt 64-bits kernels can be safely unmarked experimental
        ...
      21af0297
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 5ea293a9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
        Remove references to "make dep"
        kconfig: document use of HAVE_*
        Introduce new section reference annotations tags: __ref, __refdata, __refconst
        kbuild: warn about ld added unique sections
        kbuild: add verbose option to Section mismatch reporting in modpost
        kconfig: tristate choices with mixed tristate and boolean values
        asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
        remove __attribute_used__
        kbuild: support ARCH=x86 in buildtar
        kconfig: remove "enable"
        kbuild: simplified warning report in modpost
        kbuild: introduce a few helpers in modpost
        kbuild: use simpler section mismatch warnings in modpost
        kbuild: link vmlinux.o before kallsyms passes
        kbuild: introduce new option to enhance section mismatch analysis
        Use separate sections for __dev/__cpu/__mem code/data
        compiler.h: introduce __section()
        all archs: consolidate init and exit sections in vmlinux.lds.h
        kbuild: check section names consistently in modpost
        kbuild: introduce blacklisting in modpost
        ...
      5ea293a9
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 03bc26cf
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        Module: check to see if we have a built in module with the same name
        module: add module taint on ndiswrapper
        module: fix the module name length in param_sysfs_builtin
        module: make module_address_lookup safe
        module: better OOPS and lockdep coverage for loading modules
        module: Fix gratuitous sprintf in module.c
        module: wait for dependent modules doing init.
        module: Don't report discarded init pages as kernel text.
      03bc26cf
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 8cd226ca
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (50 commits)
        jbd2: sparse pointer use of zero as null
        jbd2: Use round-jiffies() function for the "5 second" ext4/jbd2 wakeup
        jbd2: Mark jbd2 slabs as SLAB_TEMPORARY
        jbd2: add lockdep support
        ext4: Use the ext4_ext_actual_len() helper function
        ext4: fix uniniatilized extent splitting error
        ext4: Check for return value from sb_set_blocksize
        ext4: Add stripe= option to /proc/mounts
        ext4: Enable the multiblock allocator by default
        ext4: Add multi block allocator for ext4
        ext4: Add new functions for searching extent tree
        ext4: Add ext4_find_next_bit()
        ext4: fix up EXT4FS_DEBUG builds
        ext4: Fix ext4_show_options to show the correct mount options.
        ext4: Add EXT4_IOC_MIGRATE ioctl
        ext4: Add inode version support in ext4
        vfs: Add 64 bit i_version support
        ext4: Add the journal checksum feature
        jbd2: jbd2 stats through procfs
        ext4: Take read lock during overwrite case.
        ...
      8cd226ca
    • D
      [MIPS] remove Documentation/mips/GT64120.README · a9d2517c
      Dmitri Vorobiev 提交于
      Based upon the 2.4 kernel, the information presented in the
      Documentation/mips/GT64120.README file is outdated. Worse,
      the document contents are plain misleading nowadays because
      the text mentions files and directories, which have been
      deleted, moved or restructured for 2.6.
      
      This patch removes the documentation, which is no more valid.
      Signed-off-by: NDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      a9d2517c
    • D
      [MIPS] Malta: remaining bits of the board support code cleanup · 750dc31c
      Dmitri Vorobiev 提交于
      This patch factors out the code, which handles the Bonito system
      controller. The case of not supporting the DMA coherency is handled
      separately to make the logic obvious. Besides, a couple of empty
      lines added to beautify the code even further.
      
      No functional changes introduced.
      Signed-off-by: NDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      750dc31c
    • D
      [MIPS] Malta: make the helper function static · ef7645cf
      Dmitri Vorobiev 提交于
      One helper function can become static. This patch adds the needed
      keyword.
      
      No functional changes introduced.
      Signed-off-by: NDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      ef7645cf