Milyardo: Hi michaellarabel, I'm working on rebasing my phoronix branch now
michaellarabel: Milyardo: Great :)
Milyardo: I'm up to the part where I have to resolve the conflicts pts-functions.php and phoronix-test-suite.php
Milyardo: http://phoronix.pastebin.com/d4475449d
Milyardo: :(
michaellarabel: hmm
michaellarabel: does git-diff show it?
Milyardo: Show what exactly?
michaellarabel: Well, what were you trying to fix? The difference to allow it to apply to the current master?
Milyardo: Yes
Milyardo: There the only conflict was between the prototype for pts_run_option_command
Milyardo: where you renamed the third arguement
michaellarabel: Well, what if you just change that in the patch file when you make that? Instead of committing that
michaellarabel: Milyardo: Does that make sense?
Milyardo: Sorry my display driver crashed, I can't believe nvidia calls this driver stable
michaellarabel: No problem
Milyardo: k I got them to merge
Milyardo: according to the man page you hve to git-add a file after resolving a conflict with it
Milyardo: not sure why
Milyardo: but I did it anyways :P
michaellarabel: k
Milyardo: okay now the command to properly generate the patch should be
Milyardo: git diff c410306d3f7a34358e8046500b6bc1e5d223efda 6fbc01059dc2577308424fd8f38fb5ebc199e910
Milyardo: where c410306d3f7a34358e8046500b6bc1e5d223efda is the last version of upstream?
michaellarabel: If that's the last one you pulled from
Milyardo: k :)
michaellarabel: Got it, looking at it now
michaellarabel: Milyardo: I see a problem :( But I should be able to just manually change it myself. Looks like you opened some files in gedit or other program where it saves backup copy as name.php~
Milyardo: Oops yeah :P
Milyardo: vim is unusable sometimes with this VTE bug in the nvidia driver :(
Milyardo: I suppose I could just run metacity instead though
Milyardo: >.>
michaellarabel: Actually, it looks like it might be doing it to more than that.... Look around line 1735 at all of the Git insertions that got mixed in there.
Milyardo: That looks like its in the the gedit backup file
Milyardo: the same thing is phoronix-test-suite.php
michaellarabel: Oh right
michaellarabel: for that part yes
michaellarabel: So it was just pts-functions.php that you got documented?
Milyardo: it should be more than just that file
Milyardo: but that file had conflicts
Milyardo: the rest automerged
Milyardo: unless the git repo on my laptop is more out of date than it thought it was o.o
michaellarabel: When I strip away the ~ files and doxy conf, all I have there is basically a 180 line pts-functions.php patch
Milyardo: damn, I wish raptor could just use git, I can't figure out why it can't seem to communicate with phorogit
Milyardo: Okay so I'm going to have to rebase with raptor, then rebase with phorogit again o.o
michaellarabel: This documentation sure is turning into a long chore
Milyardo: :P
Milyardo: Yeah its weird though, every other machine on campus can use git just fine
Milyardo: maybe etch has a buggy version of git
Milyardo: Perhaps I should write up a proposal to move raptor to lenny for in todays ACM meeting
Milyardo: Display driver crashed again :(
michaellarabel: Milyardo: Going to be renaming a few function files. Hopefully rebasing on Git understands that
Milyardo: Yep, I think next time it won't be so hard
Milyardo: I think I've got the general workflow down
Ivanovic: wow, i am impressed by the result of the experimental r700 drivers
Ivanovic: michaellarabel: good job
Ivanovic: seem to be really interesting results
JayF: Ivanovic: you mean the catalyst 9.1 beta?
Ivanovic: no, i mean this article: http://www.phoronix.com/scan.php?page=article&item=amd_r700_2d&num=1
maligor: exa huh
maligor: I wonder if they've fixed the corruption issues yet
michaellarabel: Deanjo: That quad-socket Tyan Shanghai board is fried
Deanjo: :(
Deanjo: How did ya manage to do that?
michaellarabel: Looks like the board is defective. I plug in the power supply and I get a bit of smoke. Tracing down where it's coming from now.
Deanjo: You bench it before slapping it into a case?
michaellarabel: Nope. The heatsinks just arrived today, hadn't powered her up yet.
Deanjo: Ya but did you mount it in a case before trying to power it the first time?
michaellarabel: yes
Deanjo: Hmmm, i'd check to see if the MB was contacting the tray
Deanjo: First step I always do is a out of case power up. Saves a lot of grief if you get a dud part
michaellarabel: Usually I always run out-of-case, except for this one where I had that CM case handy
Deanjo: Heh, seems like when ever I "have faith it will work" and assemble the whole thing first I always get stung
michaellarabel: no more smoke plugging it in a few more times, but no go booting.
Deanjo: No beep or fans?
michaellarabel: Nope, just the initial fan for a half-second when power is turned onto the power supply
Deanjo: I would really remove that board from the case and bench it outside of it. That sounds alot like a grounding out issue
michaellarabel: Yeah, trying that now. Hope it's not permanently damaged, otherwise I won't have the time before FOSDEM to bench quad Shanghais :(
Deanjo: Maybe it's just server hell day today, had to replace a Dell today at the new job
BlueKoala: Dell
BlueKoala: Good setup?
Deanjo: New employer is the creator of http://www.suneido.com/
Deanjo: Dell= crap
BlueKoala: Which ones would you recommend?
Deanjo: Usually I recommend building them
BlueKoala: I see
BlueKoala: How're the shanghais for virtualization? Any idea?
Deanjo: All reports that I've seen shows they still have a leg up on the intels
BlueKoala: I'm thinking of a project I have no ressources to execute
BlueKoala: Much like amd's cloud computing
BlueKoala: Cloud gaming I mean
BlueKoala: It would be good for mmo's
BlueKoala: fps is better off local
Deanjo: Ya they would do fine
BlueKoala: I bet it can probably be done right now with Xserver
BlueKoala: Hmmm
BlueKoala: bbl reading stuff
michaellarabel: Deanjo: No luck out of case :(
BlueKoala: :(