1. 18 Oct, 2007 31 commits
  2. 17 Oct, 2007 9 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 9d8190f8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: remove sysctl
        9p: fix bad kconfig cross-dependency
        9p: soften invalidation in loose_mode
        9p: attach-per-user
        9p: rename uid and gid parameters
        9p: define session flags
        9p: Make transports dynamic
      9d8190f8
    • Andrew Morton's avatar
      [IA64] fix non-numa build · 7259888e
      Andrew Morton authored
      
      
      arch/ia64/kernel/machine_kexec.c: In function `arch_crash_save_vmcoreinfo':
      arch/ia64/kernel/machine_kexec.c:131: error: `pgdat_list' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:131: error: (Each undeclared identifier is reported only once
      arch/ia64/kernel/machine_kexec.c:131: error: for each function it appears in.)
      arch/ia64/kernel/machine_kexec.c:134: error: `node_memblk' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:135: error: `NR_NODE_MEMBLKS' undeclared (first use in this function)
      arch/ia64/kernel/machine_kexec.c:136: error: invalid application of `sizeof' to incomplete type `node_memblk_s'
      arch/ia64/kernel/machine_kexec.c:137: error: dereferencing pointer to incomplete type
      arch/ia64/kernel/machine_kexec.c:138: error: dereferencing pointer to incomplete type
      make[1]: *** [arch/ia64/kernel/machine_kexec.o] Error 1
      
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      7259888e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · c2f73fd0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
        net: libertas sdio driver
        mmc: at91_mci: cleanup: use MCI_ERRORS
        mmc: possible leak in mmc_read_ext_csd
      c2f73fd0
    • Pierre Ossman's avatar
      net: libertas sdio driver · 727c26ed
      Pierre Ossman authored
      
      
      Add driver for Marvell's Libertas 8385 and 8686 wifi chips.
      
      Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
      Acked-by: default avatarDan Williams <dcbw@redhat.com>
      727c26ed
    • Linus Torvalds's avatar
      Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 · d20ead9e
      Linus Torvalds authored
      * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
        x86: delete vsyscall files during make clean
        kbuild: fix typo SRCARCH in find_sources
        x86: fix kernel rebuild due to vsyscall fallout
        .gitignore update for x86 arch
        x86: unify include/asm/debugreg_32/64.h
        x86: unify include/asm/unwind_32/64.h
        x86: unify include/asm/types_32/64.h
        x86: unify include/asm/tlb_32/64.h
        x86: unify include/asm/siginfo_32/64.h
        x86: unify include/asm/bug_32/64.h
        x86: unify include/asm/mman_32/64.h
        x86: unify include/asm/agp_32/64.h
        x86: unify include/asm/kdebug_32/64.h
        x86: unify include/asm/ioctls_32/64.h
        x86: unify include/asm/floppy_32/64.h
        x86: apply missing DMA/OOM prevention to floppy_32.h
        x86: unify include/asm/cache_32/64.h
        x86: unify include/asm/cache_32/64.h
        x86: unify include/asm/dmi_32/64.h
        x86: unify include/asm/delay_32/64.h
        ...
      d20ead9e
    • Sam Ravnborg's avatar
      x86: delete vsyscall files during make clean · 88e4d250
      Sam Ravnborg authored
      
      
      make clean failed to delete a few files in
      x86/kernel. This is because kbuild does not
      see the correct/full kernel/Makefile.
      
      As a workaround until the Makefiles are merged specify
      the files to be deleted in the common Makefile.
      
      Reported by Mike Galbraith <efault@gmx.de>
      
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      88e4d250
    • Yinghai Lu's avatar
      kbuild: fix typo SRCARCH in find_sources · f8bea58b
      Yinghai Lu authored
      
      
      otherwise get the two copy file list in SRCARCH
      
      for cscope:
      C symbol: start_kernel
      
        File           Function            Line
      0 proto.h        <global>              11 extern void start_kernel(void );
      1 start_kernel.h <global>              10 extern asmlinkage void __init start_kernel(void );
      2 head32.c       i386_start_kernel     37 start_kernel();
      3 head32.c       i386_start_kernel     37 start_kernel();
      4 head64.c       x86_64_start_kernel   85 start_kernel();
      5 head64.c       x86_64_start_kernel   85 start_kernel();
      6 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      7 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      8 enlighten.c    xen_start_kernel    1145 start_kernel();
      9 enlighten.c    xen_start_kernel    1145 start_kernel();
      a lguest.c       lguest_init         1095 start_kernel();
      b main.c         start_kernel         513 asmlinkage void __init start_kernel(void )
      
      after the patch:
      C symbol: start_kernel
      
        File           Function            Line
      0 proto.h        <global>              11 extern void start_kernel(void );
      1 start_kernel.h <global>              10 extern asmlinkage void __init start_kernel(void );
      2 head32.c       i386_start_kernel     37 start_kernel();
      3 head64.c       x86_64_start_kernel   85 start_kernel();
      4 head_32.S      options              199 cmpb $0,%cl #the first CPU calls start_kernel
      5 enlighten.c    xen_start_kernel    1145 start_kernel();
      6 lguest.c       lguest_init         1095 start_kernel();
      7 main.c         start_kernel         513 asmlinkage void __init start_kernel(void )
      
      Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      f8bea58b
    • Eric Van Hensbergen's avatar
      9p: remove sysctl · 982c37cf
      Eric Van Hensbergen authored
      
      
      A sysctl method was added to enable and disable debugging levels.  After
      further review, it was decided that there are better approaches to doing this
      and the sysctl methodology isn't really desirable.  This patch removes the
      sysctl code from 9p.
      
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
        
      982c37cf