1. 01 5月, 2008 34 次提交
  2. 30 4月, 2008 6 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 7cece14a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: remove duplicated include
        sparc: Add kgdb support.
        kgdbts: Sparc needs sstep emulation.
        sparc32: Kill smp_message_pass() and related code.
        sparc64: Kill PIL_RESERVED, unused.
        sparc64: Split entry.S up into seperate files.
      7cece14a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 95dfec6a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
        tcp: Overflow bug in Vegas
        [IPv4] UFO: prevent generation of chained skb destined to UFO device
        iwlwifi: move the selects to the tristate drivers
        ipv4: annotate a few functions __init in ipconfig.c
        atm: ambassador: vcc_sf semaphore to mutex
        MAINTAINERS: The socketcan-core list is subscribers-only.
        netfilter: nf_conntrack: padding breaks conntrack hash on ARM
        ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
        sch_sfq: use del_timer_sync() in sfq_destroy()
        net: Add compat support for getsockopt (MCAST_MSFILTER)
        net: Several cleanups for the setsockopt compat support.
        ipvs: fix oops in backup for fwmark conn templates
        bridge: kernel panic when unloading bridge module
        bridge: fix error handling in br_add_if()
        netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
        netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
        netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
        tcp: Limit cwnd growth when deferring for GSO
        tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
        [netdrvr] gianfar: Determine TBIPA value dynamically
        ...
      95dfec6a
    • I
      inlining: do not allow gcc below version 4 to optimize inlining · ae3a0064
      Ingo Molnar 提交于
      fix the condition to match intention: always use the old inlining
      behavior on all gcc versions below 4.
      
      this should solve the UML build problem.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ae3a0064
    • S
      Update .mailmap · 53809d7e
      S.Çağlar Onur 提交于
      I realize some of the maintainers email clients and/or scripts cannot
      handle UTF-8 encoded names properly, as a result your ChangeLogs
      displays me as two different person :).
      
      Following patch adds correctly encoded name of mine into .mailmap, to
      prevent appearing it not to be so or badly displayed.
      Signed-off-by: NS.Çağlar Onur <caglar@pardus.org.tr>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      53809d7e
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · d67c6f86
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] Update default configuration.
        [S390] use generic sys_ptrace
        [S390] Remove self ptrace IEEE_IP hack.
        [S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
        [S390] System z large page support.
        [S390] Convert machine feature detection code to C.
        [S390] vmemmap: use clear_table to initialise page tables.
        [S390] Move stfl to system.h and delete duplicated version.
        [S390] uaccess_mvcos: #ifdef config dependent code.
        [S390] cpu topology: Fix possible deadlock.
        [S390] Add topology_core_siblings to topology.h
        [S390] cio: Make isc handling more robust.
        [S390] remove -traditional
        [S390] Automatically detect added cpus.
        [S390] smp: Fix locking order.
        [S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
        [S390] Move show_regs to traps.c.
        [S390] cio: Use strict_strtoul() for attributes.
      d67c6f86
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · ec31b212
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix crashkernel= handling when no crashkernel= specified
        [POWERPC] Make emergency stack safe for current_thread_info() use
        [POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
        [POWERPC] spufs: trace spu_acquire_saved events
        [POWERPC] spufs: fix marker name for find_victim
        [POWERPC] spufs: add marker for destroy_spu_context
        [POWERPC] spufs: add sputrace marker parameter names
        [POWERPC] spufs: add context switch notification log
        [POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
        [POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
        [POWERPC] mpc5200: Fix FEC error handling on FIFO errors
        [POWERPC] mpc5200: add Phytec pcm030 board support
        [POWERPC] mpc5200: add gpiolib support for mpc5200
        [POWERPC] mpc5200: add interrupt type function
        [POWERPC] mpc5200: Fix unterminated of_device_id table
      ec31b212