1. 02 Apr, 2006 31 commits
  2. 31 Mar, 2006 9 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · 683aa401
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled
      683aa401
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · 500156a0
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected
        [MMC] Add OMAP MMC host driver
      500156a0
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 5b67e8dd
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
        [ARM] 3434/1: pxa i2s amsl define
        [ARM] 3425/1: xsc3: need to include pgtable-hwdef.h
        [ARM] Allow un-muxed syscalls to be available for everyone
        [ARM] 3420/1: Missing clobber in example code
        [ARM] nommu: fixups for the exception vectors
        [ARM] nommu: add nommu specific Kconfig and MMUEXT variable in Makefile
        [ARM] nommu: start-up code
        [ARM] nommu: MPU support in boot/compressed/head.S
      5b67e8dd
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · a8b59e79
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility
        [IA64] Export cpu cache info by sysfs
      a8b59e79
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 547a77ae
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix typo in earlier cifs_unlink change and protect one
        [CIFS] Incorrect signature sent on SMB Read
        [CIFS] Fix unlink oops when indirectly called in rename error path
        [CIFS] Fix two remaining coverity scan tool warnings.
        [CIFS] Set correct lock type on new posix unlock call
        [CIFS] Upate cifs change log
        [CIFS] Fix slow oplock break response when mounts to different
        [CIFS] Workaround various server bugs found in testing at connectathon
        [CIFS] Allow fallback for setting file size to Procom SMB server when
        [CIFS] Make POSIX CIFS Extensions SetFSInfo match exactly what we want
        [CIFS] Move noisy debug message (triggerred by some older servers) from
        [CIFS] Use correct pid on new cifs posix byte range lock call
        [CIFS] Add posix (advisory) byte range locking support to cifs client
        [CIFS] CIFS readdir perf optimizations part 1
        [CIFS] Free small buffers earlier so we exceed the cifs
        [CIFS] Fix large (ie over 64K for MaxCIFSBufSize) buffer case for wrapping
        [CIFS] Convert remaining places in fs/cifs from
        [CIFS] SessionSetup cleanup part 2
        [CIFS] fix compile error (typo) and warning in cifssmb.c
        [CIFS] Cleanup NTLMSSP session setup handling
      547a77ae
    • Steve French's avatar
      [CIFS] Fix typo in earlier cifs_unlink change and protect one · 06bcfedd
      Steve French authored
      
      extra path.
      
      Since cifs_unlink can also be called from rename path and there
      was one report of oops am making the extra check for null inode.
      
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      06bcfedd
    • Steve French's avatar
      [CIFS] Incorrect signature sent on SMB Read · e9917a00
      Steve French authored
      
      
      Fixes Samba bug 3621 and kernel.org bug 6147
      
      For servers which require SMB/CIFS packet signing, we were sending the
      wrong signature (all zeros) on SMB Read request.  The new cifs routine
      to do signatures across an iovec was not complete - and SMB Read, unlike
      the new SMBWrite2, did not fall back to the older routine (ie use
      SendReceive vs. the more efficient SendReceive2 ie used the older
      cifs_sign_smb vs. the disabled  cifs_sign_smb2) for calculating signatures.
      
      This finishes up cifs_sign_smb2/cifs_calc_signature2 so that the callers
      of SendReceive2 can get SMB/CIFS packet signatures.
      
      Now that cifs_sign_smb2 is supported, we could start using it in
      the write path but this smaller fix does not include the change
      to use SMBWrite2 when signatures are required (which when enabled
      will make more Writes more efficient and alloc less memory).
      Currently Write2 is only used when signatures are not
      required at the moment but after more testing we will enable
      that as well).
      
      Thanks to James Slepicka and Sam Flory for initial investigation.
      
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      e9917a00
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 4b75679f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Allow skb headroom to be overridden
        [TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
        [NET]: add SO_RCVBUF comment
        [NET]: Deinline some larger functions from netdevice.h
        [DCCP]: Use NULL for pointers, comfort sparse.
        [DECNET]: Fix refcount
      4b75679f
    • Jes Sorensen's avatar
      [PATCH] avoid unaligned access when accessing poll stack · 30c14e40
      Jes Sorensen authored
      Commit 70674f95
      
      :
      
        [PATCH] Optimize select/poll by putting small data sets on the stack
      
      resulted in the poll stack being 4-byte aligned on 64-bit architectures,
      causing misaligned accesses to elements in the array.
      
      This patch fixes it by declaring the stack in terms of 'long' instead
      of 'char'.
      
      Force alignment of poll and select stacks to long to avoid unaligned
      access on 64 bit architectures.
      
      Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      30c14e40