Re: mergemaster annoyance or not?

2009-03-13 Thread perryh
Daniel O'Connor docon...@gsoft.com.au wrote: I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge) to mergemaster.. One complication: to do a 3-way merge you have to have the common ancestor. To ensure the initial availability of such would require some infrastructure

Re: mergemaster annoyance or not?

2009-03-13 Thread Doug Barton
-BEGIN PGP SIGNED MESSAGE- Hash: RIPEMD160 The attached patch adds a -F option to automatically install files when only the FreeBSD $Ids differ. I've tested this and it seems to do what the people concerned about this issue are asking for. If someone affected by this issue could please

Re: NICs locking up, *tcp_sc_h

2009-03-13 Thread Robert Watson
On Fri, 13 Mar 2009, Nick Withers wrote: I recently installed my first amd64 system (currently running RELENG_7 from 2009-03-11) to replace an aged ppc box and have been having dramas with the network locking up. Breaking into the debugger manually and ps-ing shows the network card (e.g.,

Re: mergemaster annoyance or not?

2009-03-13 Thread Daniel O'Connor
On Friday 13 March 2009 17:56:17 per...@pluto.rain.com wrote: Daniel O'Connor docon...@gsoft.com.au wrote: I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge) to mergemaster.. One complication: to do a 3-way merge you have to have the common ancestor. To ensure the

Re: NICs locking up, *tcp_sc_h

2009-03-13 Thread Robert Watson
On Fri, 13 Mar 2009, Nick Withers wrote: Sorry for the original double-post, by the way, not quite sure how that happened... I can reproduce this problem relatively easily, by the way (every 3 days, on average). I meant to say this before, too, but it seems to happen a lot more often on the

Re: NICs locking up, *tcp_sc_h

2009-03-13 Thread Nick Withers
On Fri, 2009-03-13 at 09:37 +, Robert Watson wrote: On Fri, 13 Mar 2009, Nick Withers wrote: I recently installed my first amd64 system (currently running RELENG_7 from 2009-03-11) to replace an aged ppc box and have been having dramas with the network locking up. Breaking into

Re: NICs locking up, *tcp_sc_h

2009-03-13 Thread Robert Watson
On Fri, 13 Mar 2009, Robert Watson wrote: Sounds like a lock leak -- if you're running INVARIANTS, then show allocks should read WITNESS and show allchains would be useful. I've had a report of a TCP lock leak possibly in tcp_input(),

Re: Page fault panic in scioctl and console-kit-daemon

2009-03-13 Thread Arrigo Marchiori
On Mon, Mar 09, 2009 at 12:15:15PM +0100, spara wrote: Hello, I'm experiencing the same (http://www.mail-archive.com/freebsd-stable@freebsd.org/msg101997.html) after updating to last hald in 6.4-STABLE. Anyone tried to fix it with the Kostik Belousov patch as in

Re: NICs locking up, *tcp_sc_h

2009-03-13 Thread Mikolaj Golub
On Fri, 13 Mar 2009 20:56:24 +1100 Nick Withers wrote: I'm sorry to ask what is probably a very simple question, but is there somewhere I should look to get clues on debugging from a manually generated dump? I tried panic after manually envoking the kernel debugger but proved highly inept at

Re: Tester wanted for multipath failover iSCSI target software

2009-03-13 Thread Daisuke Aoyama
Oh dear doing the test again caused the client machine to panic, with the following message: panic: solaris assert: 0 == dmu_buf_hold(os, lr-lr_foid, boff, zgd, db), file /usr/src/sys/modules/zfs/../../cddl/controb/opensolaris/uts/common/fs/zfs/zfs_nops.c, line: 955 I have not read

Re: Tester wanted for multipath failover iSCSI target software

2009-03-13 Thread Pete French
I have not read the message in my experience. Do you have encountered frequency? Only once. I did not try it again because that is our work server. I did two testrs, copying files. 1) Using iscsi-target ... copies OK, but ZFS pool has errors 2) Using istgt - causes the panic described. The

Panic in radeon_get_vblank_counter()

2009-03-13 Thread Sean C. Farley
After upgrading my laptop (Dell 600m) yesterday, I have begun to experience panics on it probably related to the DRM update. Killing the X server by Ctrl-Alt-Backspace is a good way to lock the system. Reboot to get a core dump. Piece of Xorg.log concerning the hardware using the

S. M. Ibrahim lavlu's Member Invite

2009-03-13 Thread Scour
Hey there, Not too long ago S. M. Ibrahim lavlu sent you an invite to join the Scour search community and your invite is still open! The Scour search engine is shaped by a community of users just like you, and your contributions are what make it a success! Why use Scour? 1. Get Yahoo, Google

Re: Panic in radeon_get_vblank_counter()

2009-03-13 Thread Robert Noland
On Fri, 2009-03-13 at 15:49 -0500, Sean C. Farley wrote: After upgrading my laptop (Dell 600m) yesterday, I have begun to experience panics on it probably related to the DRM update. Killing the X server by Ctrl-Alt-Backspace is a good way to lock the system. Reboot to get a core dump.

Re: Panic in radeon_get_vblank_counter()

2009-03-13 Thread Sean C. Farley
On Fri, 13 Mar 2009, Robert Noland wrote: On Fri, 2009-03-13 at 15:49 -0500, Sean C. Farley wrote: After upgrading my laptop (Dell 600m) yesterday, I have begun to experience panics on it probably related to the DRM update. Killing the X server by Ctrl-Alt-Backspace is a good way to lock the