1. 08 2月, 2007 31 次提交
  2. 07 2月, 2007 9 次提交
    • A
      [GFS2] make gfs2_writepages() static · a2cf8222
      Adrian Bunk 提交于
      On Mon, Jan 29, 2007 at 08:45:28PM -0800, Andrew Morton wrote:
      >...
      > Changes since 2.6.20-rc6-mm2:
      >...
      >  git-gfs2-nmw.patch
      >...
      >  git trees
      >...
      
      This patch makes the needlessly global gfs2_writepages() static.
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      a2cf8222
    • S
      [GFS2] Unlock page on prepare_write try lock failure · 2d72e710
      Steven Whitehouse 提交于
      When the try lock of the glock failed in prepare_write we were
      incorrectly exiting this function with the page still locked.
      This was resulting in further I/O to this page hanging.
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      2d72e710
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 0670afdf
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (27 commits)
        [IA64] swiotlb abstraction (e.g. for Xen)
        [IA64] swiotlb cleanup
        [IA64] make swiotlb use bus_to_virt/virt_to_bus
        [IA64] swiotlb bug fixes
        [IA64] Hook up getcpu system call for IA64
        [IA64] clean up sparsemem memory_present call
        [IA64] show_mem() for IA64 sparsemem NUMA
        [IA64] missing exports hwsw_sync_...
        [IA64] virt_to_page() can be called with NULL arg
        [IA64] alignment bug in ldscript
        [IA64] register memory ranges in a consistent manner
        [IA64] Enable SWIOTLB only when needed
        [IA64-SGI] Check for TIO errors on shub2 Altix
        [IA64] remove bogus prototype ia64_esi_init()
        [IA64] Clear IRQ affinity when unregistered
        [IA64] fix ACPI Kconfig issues
        [IA64] Fix NULL-pointer dereference in ia64_machine_kexec()
        [IA64] find thread for user rbs address
        [IA64] use snprintf() on features field of /proc/cpuinfo
        [IA64] enable singlestep on system call
        ...
      0670afdf
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · dda2ac15
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        ocfs2: ocfs2_link() journal credits update
      dda2ac15
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · 2ac04a15
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
        USB HID: handle multi-interface devices for Apple macbook pro properly
        HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG
        USB HID: fix bogus comment in hid_get_class_descriptor()
        USB HID: remove hid_find_field_by_usage()
        HID: API - fix leftovers of hidinput API in USB HID
        HID: hid debug from hid-debug.h to hid layer
        hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter
        hid: quirk for multi-input devices with unneeded output reports
        hid: allow force feedback for multi-input devices
      2ac04a15
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 0c7d3757
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ehca: Remove obsolete prototypes
        IB/ehca: Remove use of do_mmap()
        RDMA/addr: Handle ethernet neighbour updates during route resolution
        IB: Make sure struct ib_user_mad.data is aligned
        IB/srp: Don't wait for response when QP is in error state.
        IB: Return qp pointer as part of ib_wc
        IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
      0c7d3757
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 2442d310
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (32 commits)
        mmc: tifm: replace kmap with page_address
        mmc: sdhci: fix voltage ocr
        mmc: sdhci: replace kmap with page_address
        mmc: wbsd: replace kmap with page_address
        mmc: handle pci_enable_device() return value in sdhci
        mmc: Proper unclaim in mmc_block
        mmc: change wbsd mailing list
        mmc: Graceful fallback for fancy features
        mmc: Handle wbsd's stupid command list
        mmc: Allow host drivers to specify max block count
        mmc: Allow host drivers to specify a max block size
        tifm_sd: add suspend and resume functionality
        tifm_core: add suspend/resume infrastructure for tifm devices
        tifm_7xx1: prettify
        tifm_7xx1: recognize device 0xac8f as supported
        tifm_7xx1: switch from workqueue to kthread
        tifm_7xx1: Merge media insert and media remove functions
        tifm_7xx1: simplify eject function
        Add dummy_signal_irq function to save check in ISR
        Remove unused return value from signal_irq callback
        ...
      2442d310
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 02aedd69
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits)
        [S390] Avoid excessive inlining.
        [S390] Mark kernel text section read-only.
        [S390] Convert memory detection into C code.
        [S390] Calibrate delay and bogomips.
        [S390] Hypervisor filesystem (s390_hypfs) for z/VM
        [S390] Add crypto support for 3592 tape devices
        [S390] boot from NSS support
        [S390] Support for s390 Pseudo Random Number Generator
        [S390] ETR support.
        [S390] noexec protection
        [S390] move crypto options and some cleanup.
        [S390] cio: Don't spam debug feature.
        [S390] Cleanup of CHSC event handling.
        [S390] cio: declare hardware structures packed.
        [S390] Add set_fs(USER_DS) to start_thread().
        [S390] cio: Catch operand exceptions on stsch.
        [S390] Fix register usage description.
        [S390] kretprobe_trampoline_holder() in wrong section.
        [S390] Fix kprobes breakpoint handling.
        [S390] Update maintainers file.
        ...
      02aedd69
    • D
      [PATCH] Keys: Fix key serial number collision handling · 9ad0830f
      David Howells 提交于
      Fix the key serial number collision avoidance code in key_alloc_serial().
      
      This didn't use to be so much of a problem as the key serial numbers were
      allocated from a simple incremental counter, and it would have to go through
      two billion keys before it could possibly encounter a collision.  However, now
      that random numbers are used instead, collisions are much more likely.
      
      This is fixed by finding a hole in the rbtree where the next unused serial
      number ought to be and using that by going almost back to the top of the
      insertion routine and redoing the insertion with the new serial number rather
      than trying to be clever and attempting to work out the insertion point
      pointer directly.
      
      This fixes kernel BZ #7727.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9ad0830f