1. 15 2月, 2007 33 次提交
  2. 14 2月, 2007 7 次提交
    • T
      ac98695d
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 93bbad8f
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mthca: Always fill MTTs from CPU
        IB/mthca: Merge MR and FMR space on 64-bit systems
        IB/mthca: Fix access to MTT and MPT tables on non-cache-coherent CPUs
        IB/mthca: Give reserved MTTs a separate cache line
        IB/mthca: Fix reserved MTTs calculation on mem-free HCAs
        RDMA/cxgb3: Add driver for Chelsio T3 RNIC
        IB: Remove redundant "_wq" from workqueue names
        RDMA/cma: Increment port number after close to avoid re-use
        IB/ehca: Fix memleak on module unloading
        IB/mthca: Work around gcc bug on sparc64
        IPoIB: Connected mode experimental support
        IB/core: Use ARRAY_SIZE macro for mandatory_table
        IB/mthca: Use correct structure size in call to memset()
      93bbad8f
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 9468482b
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] on reconnect to Samba - reset the unix capabilities
        [CIFS] Allow update of EOF on remote extend of file
        [CIFS] POSIX CIFS Extensions (continued) - POSIX Open
        [CIFS] Additional POSIX CIFS Extensions infolevels
      9468482b
    • S
      [CIFS] on reconnect to Samba - reset the unix capabilities · 8af18971
      Steve French 提交于
      After temporary server or network failure and reconneciton, we were not
      resending the unix capabilities via SetFSInfo - which confused Samba posix
      byte range locking code.
      
      Discovered by jra
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      8af18971
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 551a10c7
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [IPSEC]: Fix the address family to refer encap_family
        [IPSEC]: changing API of xfrm6_tunnel_register
        [IPSEC]: make sit use the xfrm4_tunnel_register
        [IPSEC]: Changing API of xfrm4_tunnel_register.
        [TCP]: Prevent pseudo garbage in SYN's advertized window
        [NET_SCHED]: sch_hfsc: replace ASSERT macro by WARN_ON
        [BRIDGE] br_if: Fix oops in port_carrier_check
        [NETFILTER]: Clear GSO bits for TCP reset packet
        [TG3]: Update copyright, version, and reldate.
        [TG3]: Add some tx timeout debug messages.
        [TG3]: Use constant for PHY register 0x1e.
        [TG3]: Power down 5704 serdes transceiver when shutting down.
        [TG3]: 5906 doesn't need to switch to slower clock.
        [TG3]: 5722/5756 don't need PHY jitter workaround.
        [TG3]: Use lower DMA watermark for 5703.
        [TG3]: Save MSI state before suspend.
        [XFRM]: Fix IPv4 tunnel mode decapsulation with IPV6=n
        [IPV6] HASHTABLES: Use appropriate seed for caluculating ehash index.
      551a10c7
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · f90203e0
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (61 commits)
        [POWERPC] Use udbg_early_init() on ppc32
        [POWERPC] Open Firmware serial port driver
        [POWERPC] Move MPIC smp routines into mpic.c
        [POWERPC] Cleanup pseries kexec code
        [POWERPC] Cleanup pseries smp initialisation code
        [POWERPC] Consolidate pseries platform header files into pseries.h
        [POWERPC] 85xx: Drop use of SYNC macro in head_fsl_booke.S
        [POWERPC] cell: pm_rtas_activat_signals routine cleanup
        [POWERPC] cell: PPU Oprofile cleanup patch
        [POWERPC] spufs: avoid accessing kernel memory through mmapped /mem node
        [POWERPC] spu sched: static timeslicing for SCHED_RR contexts
        [POWERPC] spu sched: use DECLARE_BITMAP
        [POWERPC] spu sched: forced preemption at execution
        [POWERPC] spu sched: update some comments
        [POWERPC] spu sched: simplity spu_remove_from_active_list
        [POWERPC] spufs: optimize spu_run
        [POWERPC] spufs: runqueue simplification
        [POWERPC] spufs: move prio to spu_context
        [POWERPC] spufs: state_mutex cleanup
        [POWERPC] spufs: simplify state_mutex
        ...
      f90203e0
    • D
      [POWERPC] Use udbg_early_init() on ppc32 · 719c91cc
      David Gibson 提交于
      udbg_early_init() is a function used on 64 bit systems, which
      initializes whichever early udbg backend is configured.  This function
      is not called on 32-bit, however if btext early debug is enabled it
      does have an explicit, inline, #ifdef-ed assignment performing
      analagous initialization.
      
      This patch makes things more uniform by folding the btext
      initialization as an option into udbg_early_init() and calling that
      from the 32-bit setup path.
      Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      719c91cc