[00:45:57] --- Simon Wilkinson has become available [03:09:37] --- Simon Wilkinson has left [03:53:19] --- Russ has left: Disconnected [04:26:35] --- Simon has become available [04:44:58] --- Simon has left [05:55:56] --- jakllsch has left [06:02:47] I have here a really strange backtrace from a core of vos (happened during vos dump ...). It says that I had z_conn=0x7fff8841cc00 when I enter AFSVolEndTrans() and just an instant later when rx_NewCall() is called on the first line of AFSVolEndTrans(), conn is 0x0. [07:04:01] --- jakllsch has become available [07:05:39] did gerrit 5422 fail to merge because of the contents of the commit message? [07:06:14] --- phalenor has left [07:06:17] --- phalenor has become available [07:08:36] a merge failure is an indication that another independent patchset was committed to the tree that conflicts with this one. [07:09:23] you need to rebase the patchset against current HEAD on origin/master and resubmit [07:10:12] well, it was actually to openafs-stable-1_6_x, and i had already had to resolve a conflict when i cherry picked it [07:11:05] we don't generally include a "Conflicts:" stanza [07:11:08] fwiw [07:11:39] I usually remove them after the edit [07:24:09] --- lars.malinowsky has left [07:24:20] --- lars.malinowsky has become available [07:37:40] hmm. gerrit is hanging up on my git client when attempting to push changes to master [07:43:08] "fatal: internal server error" [07:55:49] huh, it worked for me just before you mentioned that [07:57:53] perhaps your commit broke it :) [07:58:05] its is working now [08:50:05] --- deason/gmail has become available [08:58:36] --- reuteras has left [09:23:29] --- haba has left [09:38:58] --- Jeffrey Altman has become available [09:39:04] --- jaltman/FrogsLeap has left: Replaced by new connection [09:39:05] --- jaltman/FrogsLeap has become available [09:51:51] --- mfelliott has left [10:04:59] --- haba has become available [10:05:16] --- Simon has become available [10:18:14] --- Simon has left [11:45:49] --- Simon Wilkinson has become available [12:59:24] --- mfelliott has become available [14:25:28] --- jaltman/FrogsLeap has left: Replaced by new connection [14:25:29] --- jaltman/FrogsLeap has become available [14:25:53] --- Jeffrey Altman has left: Replaced by new connection [14:25:53] --- Jeffrey Altman has become available [14:42:25] --- Russ has become available [14:46:37] --- jaltman/FrogsLeap has left: Disconnected [14:48:27] --- jaltman/FrogsLeap has become available [14:59:00] --- jakllsch has left [14:59:00] --- jakllsch has become available [15:03:09] --- haba has left [15:22:53] --- jaltman/FrogsLeap has left: Disconnected [15:40:30] --- jakllsch has left [15:44:31] --- jakllsch has become available [15:57:30] --- jakllsch has left [16:00:22] --- deason/gmail has left [17:04:08] --- jaltman/FrogsLeap has become available [17:33:36] --- Russ has left: Disconnected [18:02:39] --- jaltman/FrogsLeap has left: Replaced by new connection [18:02:40] --- jaltman/FrogsLeap has become available [18:05:36] --- mdionne has become available [18:34:44] --- jaltman/FrogsLeap has left [19:16:57] --- mdionne has left [19:20:37] --- kaduk@mit.edu/barnowl has left [19:20:38] --- jaltman/FrogsLeap has become available [19:21:20] --- kaduk@mit.edu/barnowl has become available [20:05:49] --- Russ has become available [22:35:30] --- reuteras has become available [22:59:56] --- Jeffrey Altman has left: Replaced by new connection [23:01:00] --- jaltman/FrogsLeap has left: Replaced by new connection [23:01:01] --- jaltman/FrogsLeap has become available [23:55:14] --- Simon Wilkinson has left