1. 03 12月, 2006 2 次提交
  2. 26 11月, 2006 4 次提交
  3. 25 11月, 2006 1 次提交
  4. 23 11月, 2006 26 次提交
  5. 22 11月, 2006 7 次提交
    • L
      Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 0f9005a6
      Linus Torvalds 提交于
      * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix ucc_geth of_device discovery on mpc832x
        [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
        [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
      0f9005a6
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · c5dd2733
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Add missing unlock in tg3_open() error path.
        [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
        [IRDA]: Lockdep fix.
        [BLUETOOTH]: Fix unaligned access in hci_send_to_sock.
        [XFRM]: nlmsg length not computed correctly in the presence of subpolicies
        [XFRM]: Sub-policies broke policy events
        [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
        [Bluetooth] Ignore L2CAP config requests on disconnect
        [Bluetooth] Always include MTU in L2CAP config responses
        [Bluetooth] Check if RFCOMM session is still attached to the TTY
        [Bluetooth] Handling pending connect attempts after inquiry
        [Bluetooth] Attach low-level connections to the Bluetooth bus
        [IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
        [IPV6] IP6TUNNEL: Delete all tunnel device when unloading module.
        [IPV6] ROUTE: Do not enable router reachability probing in router mode.
        [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
        [IPV6] ROUTE: Try to use router which is not known unreachable.
      c5dd2733
    • K
      [POWERPC] Fix ucc_geth of_device discovery on mpc832x · 8746ed3d
      Kim Phillips 提交于
      mpc832x, as in mpc8360, needs to explicitly find and create the
      platform device for ucc_geth in 2.6.19.  This code will likely be
      readapted to Benh's new of_ methods for 2.6.20.
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      8746ed3d
    • I
      [TG3]: Add missing unlock in tg3_open() error path. · 12862086
      Ira W. Snyder 提交于
      Sparse noticed a locking imbalance in tg3_open(). This patch adds an
      unlock to one of the error paths, so that tg3_open() always exits
      without the lock held.
      Signed-off-by: NIra W. Snyder <kernel@irasnyder.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      12862086
    • Y
      [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture. · f2776ff0
      YOSHIFUJI Hideaki 提交于
      TCP and RAW do not have this issue.  Closes Bug #7432.
      Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f2776ff0
    • P
      [IRDA]: Lockdep fix. · 700f9672
      Peter Zijlstra 提交于
      On Sat, 2006-11-18 at 16:12 +0300, Andrey Borzenkov wrote:
      
      > =============================================
      > [ INFO: possible recursive locking detected ]
      > 2.6.19-rc5-2avb #2
      > - ---------------------------------------------
      > pppd/26425 is trying to acquire lock:
      >  (&hashbin->hb_spinlock){....}, at: [<dfdea87a>] irlmp_slsap_inuse+0x5a/0x170
      > [irda]
      >
      > but task is already holding lock:
      >  (&hashbin->hb_spinlock){....}, at: [<dfdea857>] irlmp_slsap_inuse+0x37/0x170
      > [irda]
      >
      > other info that might help us debug this:
      > 1 lock held by pppd/26425:
      >  #0:  (&hashbin->hb_spinlock){....}, at: [<dfdea857>]
      > irlmp_slsap_inuse+0x37/0x170 [irda]
      >
      > stack backtrace:
      >  [<c010413c>] dump_trace+0x1cc/0x200
      >  [<c010418a>] show_trace_log_lvl+0x1a/0x30
      >  [<c01047f2>] show_trace+0x12/0x20
      >  [<c01048c9>] dump_stack+0x19/0x20
      >  [<c01346ca>] __lock_acquire+0x8fa/0xc20
      >  [<c0134d2d>] lock_acquire+0x5d/0x80
      >  [<c02a851c>] _spin_lock+0x2c/0x40
      >  [<dfdea87a>] irlmp_slsap_inuse+0x5a/0x170 [irda]
      >  [<dfdebab2>] irlmp_open_lsap+0x62/0x180 [irda]
      >  [<dfdf35d1>] irttp_open_tsap+0x181/0x230 [irda]
      >  [<dfdc0c3d>] ircomm_open_tsap+0x5d/0xa0 [ircomm]
      >  [<dfdc05d8>] ircomm_open+0xb8/0xd0 [ircomm]
      >  [<dfdd0477>] ircomm_tty_open+0x4f7/0x570 [ircomm_tty]
      >  [<c020bbe4>] tty_open+0x174/0x340
      >  [<c016bd69>] chrdev_open+0x89/0x170
      >  [<c0167bd6>] __dentry_open+0xa6/0x1d0
      >  [<c0167da5>] nameidata_to_filp+0x35/0x40
      >  [<c0167df9>] do_filp_open+0x49/0x50
      >  [<c0167e47>] do_sys_open+0x47/0xd0
      >  [<c0167f0c>] sys_open+0x1c/0x20
      >  [<c010307d>] sysenter_past_esp+0x56/0x8d
      >  [<b7f86410>] 0xb7f86410
      >  =======================
      
      The comment at the nesting lock says:
      
      	/* Careful for priority inversions here !
      	 * irlmp->links is never taken while another IrDA
      	 * spinlock is held, so we are safe. Jean II */
      
      So, under the assumption the author was right, it just needs a lockdep
      annotation.
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      700f9672
    • K