1. 27 Jun, 2006 36 commits
  2. 26 Jun, 2006 4 commits
    • Linus Torvalds's avatar
      Revert "kbuild: fix make -rR breakage" · d38b6968
      Linus Torvalds authored
      This reverts commit e5c44fd8
      
      .
      
      Thanks to Daniel Ritz and Michal Piotrowski for noticing the problem.
      
      Daniel says:
      
        "[The] reason is a recent change that made modules always shows as
         module.mod.  it breaks modprobe and probably many scripts..besides
         lsmod looking horrible
      
         stuff like this in modprobe.conf:
              install pcmcia_core /sbin/modprobe --ignore-install pcmcia_core; /sbin/modprobe pcmcia
         makes modprobe fork/exec endlessly calling itself...until oom
         interrupts it"
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d38b6968
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · eb99adde
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
        [PATCH] fs/ocfs2/dlm/: cleanups
        ocfs2: fix compiler warnings in dlm_convert_lock_handler()
        ocfs2: dlm_print_one_mle() needs to be defined
        ocfs2: remove whitespace in dlmunlock.c
        ocfs2: move dlm work to a private work queue
        ocfs2: fix incorrect error returns
        ocfs2: tune down some noisy messages during dlm recovery
        ocfs2: display message before waiting for recovery to complete
        ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR
        ocfs2: retry operations when a lock is marked in recovery
        ocfs2: use cond_resched() in dlm_thread()
        ocfs2: use GFP_NOFS in some dlm operations
        ocfs2: wait for recovery when starting lock mastery
        ocfs2: continue recovery when a dead node is encountered
        ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks()
        ocfs2: dlm_remaster_locks() should never exit without completing
        ocfs2: special case recovery lock in dlmlock_remote()
        ocfs2: pending mastery asserts and migrations should block each other
        ocfs2: temporarily disable automatic lock migration
        ocfs2: do not unconditionally purge the lockres in dlmlock_remote()
        ...
      eb99adde
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · f6e6e883
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
        [ARM] Update mach-types
        [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
        [ARM] 3654/1: add ajeco 1arm sbc support
        [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
        [ARM] 3651/1: S3C24XX: Make arch list more detailed
        [ARM] 3650/1: S3C2412: Update s3c2410_defconfig
        [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
        [ARM] 3612/1: make pci bus optional for ixp4xx platform
        [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
        [ARM] Remove save_lr/restore_pc macros
        [ARM] Remove partial non-v6 binutils compatibility
        [ARM] Remove LOADREGS macro
        [ARM] Remove RETINSTR macro
      f6e6e883
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · ba262e4a
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] 8250_pnp: add support for other Wacom tablets
      ba262e4a