1. 17 10月, 2006 37 次提交
  2. 16 10月, 2006 3 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 5206a79d
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
        [Bluetooth] Use work queue to trigger URB submission
        [Bluetooth] Add locking for bt_proto array manipulation
        [Bluetooth] Check if DLC is still attached to the TTY
        [Bluetooth] Fix reference count when connection lookup fails
        [Bluetooth] Disconnect HID interrupt channel first
        [Bluetooth] Support concurrent connect requests
        [Bluetooth] Make use of virtual devices tree
        [Bluetooth] Handle return values from driver core functions
        [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP
        [IPV6] sit: Add missing MODULE_LICENSE
        [IPV6]: Remove bogus WARN_ON in Proxy-NA handling.
        [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors
        [XFRM]: Fix xfrm_state_num going negative.
        [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire()
        NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly
        NetLabel: better error handling involving mls_export_cat()
        NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping
        [BRIDGE]: flush forwarding table when device carrier off
        [NETFILTER]: ctnetlink: Remove debugging messages
        [NETFILTER]: Update MAINTAINERS entry
        ...
      5206a79d
    • D
      [PATCH] FRV: Use the correct preemption primitives in kmap_atomic() and co · 29da7eb0
      David Howells 提交于
      Use inc/dec_preempt_count() rather than preempt_enable/disable() and manually
      add in the compiler barriers that were provided by the latter.  This makes FRV
      consistent with other archs.
      
      Furthermore, the compiler barrier effects are now there unconditionally - at
      least as far as preemption is concerned - because we don't want the compiler
      moving memory accesses out of the section of code in which the mapping is in
      force - in effect the kmap_atomic() must imply a LOCK-class barrier and the
      kunmap_atomic() must imply an UNLOCK-class barrier to the compiler.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      29da7eb0
    • A
      [PATCH] scsi: megaraid_{mm,mbox}: 64-bit DMA capability fix · 8741ca71
      Andrey Mirkin 提交于
      It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and
      150-6) don't support 64-bit DMA.  Unfortunately currently this check is
      wrong and driver sets 64-bit DMA mode for these devices.
      Signed-off-by: NAndrey Mirkin <amirkin@sw.ru>
      Acked-by: NVasily Averin <vvs@sw.ru>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      8741ca71