1. 09 Feb, 2007 38 commits
  2. 08 Feb, 2007 2 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 5986a2ec
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2: (22 commits)
        configfs: Zero terminate data in configfs attribute writes.
        [PATCH] ocfs2 heartbeat: clean up bio submission code
        ocfs2: introduce sc->sc_send_lock to protect outbound outbound messages
        [PATCH] ocfs2: drop INET from Kconfig, not needed
        ocfs2_dlm: Add timeout to dlm join domain
        ocfs2_dlm: Silence some messages during join domain
        ocfs2_dlm: disallow a domain join if node maps mismatch
        ocfs2_dlm: Ensure correct ordering of set/clear refmap bit on lockres
        ocfs2: Binds listener to the configured ip address
        ocfs2_dlm: Calling post handler function in assert master handler
        ocfs2: Added post handler callable function in o2net message handler
        ocfs2_dlm: Cookies in locks not being printed correctly in error messages
        ocfs2_dlm: Silence a failed convert
        ocfs2_dlm: wake up sleepers on the lockres waitqueue
        ocfs2_dlm: Dlm dispatch was stopping too early
        ocfs2_dlm: Drop inflight refmap even if no locks found on the lockres
        ocfs2_dlm: Flush dlm workqueue before starting to migrate
        ocfs2_dlm: Fix migrate lockres handler queue scanning
        ocfs2_dlm: Make dlmunlock() wait for migration to complete
        ocfs2_dlm: Fixes race between migrate and dirty
        ...
      5986a2ec
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 43187902
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        Revert "Driver core: convert SPI code to use struct device"
      43187902