1. 14 Feb, 2007 23 commits
  2. 13 Feb, 2007 17 commits
    • Trond Myklebust's avatar
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 93bbad8f
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 9468482b
      Linus Torvalds authored
      * 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
    • Steve French's avatar
      [CIFS] on reconnect to Samba - reset the unix capabilities · 8af18971
      Steve French authored
      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: default avatarSteve French <sfrench@us.ibm.com>
      8af18971
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 551a10c7
      Linus Torvalds authored
      * 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
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · f90203e0
      Linus Torvalds authored
      * 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
    • David Gibson's avatar
      [POWERPC] Use udbg_early_init() on ppc32 · 719c91cc
      David Gibson authored
      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: default avatarDavid Gibson <dwg@au1.ibm.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      719c91cc
    • Arnd Bergmann's avatar
      [POWERPC] Open Firmware serial port driver · 8d38a5b2
      Arnd Bergmann authored
      This can be used for serial ports that are connected to an
      OF platform bus but are not autodetected by the lecacy
      serial support.
      It will automatically take over devices that come from the
      legacy serial detection, which usually is only one device.
      
      In some cases, rtas may be set up to use the serial port
      in the firmware, which allows easier debugging before probing
      the serial ports. In this case, the "used-by-rtas" property
      must be set by the firmware. This patch also adds code to the
      legacy serial driver to check for this.
      Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      8d38a5b2
    • Michael Ellerman's avatar
      [POWERPC] Move MPIC smp routines into mpic.c · 775aeff4
      Michael Ellerman authored
      Move a couple of MPIC smp routines into mpic.c, they're inside an SMP
      block in mpic.c - so they're still only built for SMP.
      Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      775aeff4
    • Michael Ellerman's avatar
      [POWERPC] Cleanup pseries kexec code · dce623e0
      Michael Ellerman authored
      Move all the pseries kexec code into one file, platforms/pseries/kexec.c
      Provide helpers for setting up ppc_md.kexec_cpu_down, so that we don't
      have to have #ifdef CONFIG_KEXEC in setup.c
      
      Move the initialisation of the ppc_md kexec callbacks into an init routine.
      This is well and truly early enough to cause no change in behaviour, we
      can't kexec until userspace has given us a kernel to kexec into.
      Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      dce623e0
    • Michael Ellerman's avatar
      [POWERPC] Cleanup pseries smp initialisation code · 8feaeca2
      Michael Ellerman authored
      Move some extern declarations from setup.c into the new pseries.h.
      While we're at it, provide dummy implementations for !SMP, to avoid
      cluttering the C file with more #ifdefs.
      Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      8feaeca2
    • Michael Ellerman's avatar
      [POWERPC] Consolidate pseries platform header files into pseries.h · 577830b0
      Michael Ellerman authored
      Following the example of platforms/pasemi, consolidate a couple of
      tiny header files in platforms/pseries into pseries.h.
      
      This gives us a convenient place to put things that need to be
      available to the platform code, but not public. And hopefully will
      help people resist the temptation of sticking externs in C files.
      Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      577830b0
    • Paul Mackerras's avatar
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 33e563c1
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Stop using i2c_adapter.class_dev
        i2c: Remove the warning on missing adapter device
        i2c: Declare more i2c_adapter parent devices
        i2c: PA Semi SMBus driver
        i2c-amd8111: Proposed cleanups
        i2c-parport: Add support for One For All remote JP1 interface
        i2c-viapro: Add support for the VIA CX700 south bridge
        i2c: Add IDs to adapters
        i2c: Update the list of bus IDs
        i2c: Add driver suspend/resume/shutdown support
        i2c: completion header cleanups
        i2c-i801: Document the SMBus unhiding quirk
        i2c-i801: Spelling fix
        i2c: Fix typo in SMBus Write Word Data description
        i2c-piix4: Add support for the ATI SB600
        i2c-nforce2: Drop unused reference to pci_dev
        i2c/vt8231: Remove superfluous initialization
        i2c-ali1563: Fix device initialization
        i2c-ali1563: Improve the status messages
      33e563c1
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 463020ce
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
        [MIPS] Fix uniprocessor Sibyte builds.
        [MIPS] Make entry.S a little more readable.
        [MIPS] Remove stray instruction from __get_user_asm_ll32.
        [MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace.
        [MIPS] DECstation: Fix irq handling
        [MIPS] signals: make common _BLOCKABLE macro
        [MIPS] signal: Move sigframe definition for native O32/N64 into signal.c
        [MIPS] signal: Move {restore,setup}_sigcontext prototypes to their user
        [MIPS] signal: Fix warnings in o32 compat code.
        [MIPS] IP27: Enable N32 support in defconfig.
        Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."
        [MIPS] Don't claim we support dma_declare_coherent_memory - we don't.
        [MIPS] Unify dma-{coherent,noncoherent.ip27,ip32}
        [MIPS] Improve branch prediction in ll/sc atomic operations.
      463020ce
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 58a3bb59
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (23 commits)
        [WATCHDOG] timers cleanup
        [WATCHDOG] ib700wdt.c - convert to platform_device part 2
        [WATCHDOG] ib700wdt.c - convert to platform_device
        [WATCHDOG] ib700wdt.c spinlock/WDIOC_SETOPTIONS changes
        [WATCHDOG] ib700wdt.c small clean-up's
        [WATCHDOG] ib700wdt.c clean-up init and exit routines
        [WATCHDOG] ib700_wdt.c stop + set_heartbeat operations
        [WATCHDOG] show default value for nowayout in module parameter
        [WATCHDOG] advantechwdt.c - convert to platform_device part 2
        [WATCHDOG] advantechwdt.c - convert to platform_device
        [WATCHDOG] advantechwdt.c - move set_heartbeat to a seperate function
        [WATCHDOG] advantechwdt.c - cleanup before platform_device patches
        [WATCHDOG] acquirewdt.c - convert to platform_device part 2
        [WATCHDOG] acquirewdt.c - convert to platform_device
        [WATCHDOG] acquirewdt.c - clean before platform_device patches
        [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches
        [WATCHDOG] pcwd.c - e-mail adres update
        [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches
        [WATCHDOG] pcwd_usb.c - document includes
        [WATCHDOG] pcwd_pci.c - spinlock fixes
        ...
      58a3bb59
    • Eric W. Biederman's avatar
      [PATCH] Fix SAK_work workqueue initialization. · 7f1f86a0
      Eric W. Biederman authored
      Somewhere in the rewrite of the work queues my cleanup of SAK handling
      got broken.  Maybe I didn't retest it properly or possibly the API
      was changing so fast I missed something.  Regardless currently
      triggering a SAK now generates an ugly BUG_ON and kills the kernel.
      
      Thanks to Alexey Dobriyan <adobriyan@openvz.org> for spotting this.
      
      This modifies the use of SAK_work to initialize it when the data
      structure it resides in is initialized, and to simply call
      schedule_work when we need to generate a SAK.  I update both
      data structures that have a SAK_work member for consistency.
      
      All of the old PREPARE_WORK calls that are now gone.
      
      If we call schedule_work again before it has processed it
      has generated the first SAK it will simply ignore the duplicate
      schedule_work request.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7f1f86a0