[06:19] <Frink2> Hey I've gotta merge two branches and I'm not sure how to do that...
[06:20] <Frink2> basically trying to do lpia-rt
[06:21] <Frink2> as i understand I'd need to git the main branch and then merge the personal branches for the two projects -am I right?
[06:25] <Frink2> bUMP!
[06:37] <ziroday> Hi, anyone know what could possibly be causing this? https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/116752
[06:37] <ubot3> Malone bug 116752 in linux-source-2.6.20 "NMI received for unknown reason a0 on CPU 0" [Undecided,Won't fix] 
[13:11] <maxb> I'm being stymied by sporadic kernel panics on a HP Pavilion laptop, is there anything I can do to extract some useful diagnostic information?
[14:34] <frink1> anyone awake?
[14:35] <frink1> I'm trying to merge LPIA and RT patches not that familiar with git
[15:00] <frink1> balbir: you familiar with git merge?
[20:38] <crimsun> maxb: under what conditions? have you a backtrace? also, does said laptop have a broadcom wifi chipset, and if so, are you using linux-restricted-modules-2.6.27-11-generic from intrepid-proposed?
[20:46] <maxb> Under seemingly arbitrary conditions. Backtrace: No. Is there any way to get one when the panic occurs whilst using X? Chipset: not sure. will check.
[20:49] <crimsun> maxb: if you're fortunate, it will have been logged to /var/log/kern.log
[20:49] <maxb> It's an intel 3945
[20:49] <maxb> Ah, I wasn't aware of that, I shall check there
[22:15] <frink1> is anyone here? really?
[22:15] <frink1> still trying to figure out how to merge rt and lpia branches
[22:59] <frink1> Hello?
[23:00] <laga> frink1: try asking on the kernel team mailing list.. and try asking some real questions, not just meta question
[23:01] <frink1> laga: I've got a specific question
[23:01] <frink1> how do I merge two branches
[23:02] <frink1> do I need to download the main source and then merge?
[23:02] <frink1> or do I merge one to the other?
[23:02] <frink1> or what...?
[23:03] <laga> um, that's probably covered in the git documentation
[23:04] <frink1> haven't been able to find it
[23:04] <frink1> figured most kernel guys would know an answer to something stupid like that
[23:05] <frink1> I'm just an svn guy - git is strange