1. 26 Apr, 2008 38 commits
  2. 25 Apr, 2008 2 commits
    • Roland Dreier's avatar
      Export __locks_copy_lock() so modular lockd builds · 3dd7b71c
      Roland Dreier authored
      Commit 1a747ee0 ("locks: don't call ->copy_lock methods on return of
      conflicting locks") changed fs/lockd/svclock.c to call
      __locks_copy_lock() instead of locks_copy_lock(), but lockd can be built
      as a module and __locks_copy_lock() is not exported, which causes a
      build error
      
          ERROR: "__locks_copy_lock" [fs/lockd/lockd.ko] undefined!
      
      with CONFIG_LOCKD=m.
      
      Fix this by exporting __locks_copy_lock().
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3dd7b71c
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · b9fa38f7
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
        [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
        [POWERPC] bootwrapper: fix build error on virtex405-head.S
        [POWERPC] 4xx: Fix 460GT support to not enable FPU
        [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
        [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
        [POWERPC] Xilinx: boot support for Xilinx uart 16550.
        [POWERPC] celleb: Add support for PCI Express
        [POWERPC] celleb: Move miscellaneous files for Beat
        [POWERPC] celleb: Move a file for SPU on Beat
        [POWERPC] celleb: Move files for Beat mmu and iommu
        [POWERPC] celleb: Move files for Beat hvcall interfaces
        [POWERPC] celleb: Move the SCC related code for celleb
        [POWERPC] celleb: Move the files for celleb base support
        [POWERPC] celleb: Consolidate io-workarounds code
        [POWERPC] cell: Generalize io-workarounds code
        [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
        [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
        [POWERPC] Register udbg console early on pseries LPAR
        [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
        [POWERPC] Set udbg_console index to 0
        ...
      b9fa38f7