| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === xulin [n=xulin@lns-bzn-42-82-255-86-233.adsl.proxad.net] has joined #ubuntu-kernel | ||
| xulin | hi .. | 02:03 |
|---|---|---|
| xulin | is there somebody who know things about tcpa ? | 02:03 |
| === xulin [n=xulin@lns-bzn-42-82-255-86-233.adsl.proxad.net] has left #ubuntu-kernel ["free] | ||
| === Yagisan [n=jamie@60-240-18-121-nsw-pppoe.tpgi.com.au] has joined #ubuntu-kernel | ||
| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === Yagisan [n=jamie@60-240-18-121-nsw-pppoe.tpgi.com.au] has joined #ubuntu-kernel | ||
| === TheMuso [n=luke@dsl-202-173-132-131.nsw.westnet.com.au] has joined #ubuntu-kernel | ||
| === Traxer|off [i=traxer@shell6.powershells.de] has joined #ubuntu-kernel | ||
| === siretart [i=siretart@ubuntu/member/siretart] has joined #ubuntu-kernel | ||
| === smurf [n=smurf@debian/developer/smurf] has joined #ubuntu-kernel | ||
| === fs [i=fs@213.178.77.98] has joined #ubuntu-kernel | ||
| === Mithrandir [n=tfheen@c5100BC63.inet.catch.no] has joined #ubuntu-kernel | ||
| === makx [n=max@baikonur.stro.at] has joined #ubuntu-kernel | ||
| === mjg59 [n=mjg59@cavan.codon.org.uk] has joined #ubuntu-kernel | ||
| === infinity [n=adconrad@loki.0c3.net] has joined #ubuntu-kernel | ||
| === dilinger [i=dilinger@mouth.voxel.net] has joined #ubuntu-kernel | ||
| === crimsun [i=crimsun@pdpc/supporter/silver/crimsun] has joined #ubuntu-kernel | ||
| === fs [i=fs@213.178.77.98] has joined #ubuntu-kernel | ||
| === Yagisan [n=jamie@60-240-18-121-nsw-pppoe.tpgi.com.au] has joined #ubuntu-kernel | ||
| === TheMuso [n=luke@dsl-202-173-132-131.nsw.westnet.com.au] has joined #ubuntu-kernel | ||
| === Mithrandir [n=tfheen@c5100BC63.inet.catch.no] has joined #ubuntu-kernel | ||
| === TheMuso [n=luke@dsl-202-173-132-131.nsw.westnet.com.au] has joined #ubuntu-kernel | ||
| === TheMuso [n=luke@dsl-202-173-132-131.nsw.westnet.com.au] has joined #ubuntu-kernel | ||
| === raghu [i=raghu@wireless-023-018.usc.edu] has joined #ubuntu-kernel | ||
| raghu | hi, I am developing a packet scheduling policy in Ubuntu Kernel(N/w subsystem), I am struck at a point | 11:11 |
| raghu | it would be gr8 if I could get some help | 11:11 |
| raghu | I have sprinkled printk(KERN_CRIT,"kernel ... "); in the following functions in ip_input.c | 11:11 |
| raghu | ip_rcv(), ip_rcv_finish(), net_rx_action() | 11:11 |
| raghu | but I do not see the messages in /var/log/messages? any ideas pls | 11:11 |
| raghu | ? | 11:17 |
| === raghu [i=raghu@wireless-023-018.usc.edu] has left #ubuntu-kernel [] | ||
| === TheMuso [n=luke@dsl-202-173-132-131.nsw.westnet.com.au] has joined #ubuntu-kernel | ||
| === JanC [n=janc@lugwv/member/JanC] has joined #ubuntu-kernel | ||
| === mkrufky [n=mk@user-12lcpqp.cable.mindspring.com] has joined #ubuntu-kernel | ||
| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === zul [n=chuck@Toronto-HSE-ppp3640981.sympatico.ca] has joined #ubuntu-kernel | ||
| zul | heylo | 04:30 |
| === BenC [n=bcollins@debian/developer/bcollins] has joined #ubuntu-kernel | ||
| === siretart [i=siretart@ubuntu/member/siretart] has left #ubuntu-kernel [] | ||
| === BenC_ [n=bcollins@richmond-209-163-125-167.dynamic-dialup.coretel.net] has joined #ubuntu-kernel | ||
| === JaneW [n=JaneW@wbs-146-174-135.telkomadsl.co.za] has joined #ubuntu-kernel | ||
| === mkrufky [n=mk@user-12lcpqp.cable.mindspring.com] has left #ubuntu-kernel [] | ||
| fabbione | BenC: please revert af586a17bada5fa8300ff7a33ef961ec4964b312 (sparc -> sparc64 rename) | 09:20 |
| fabbione | or pull from me | 09:21 |
| fabbione | .15 failed because i forgot an override in sbuild | 09:22 |
| fabbione | and the change will make kernel-package cry out loud | 09:22 |
| === doko__ [n=doko@dslb-084-059-093-191.pools.arcor-ip.net] has joined #ubuntu-kernel | ||
| fabbione | BenC: when you have time, please revert the OCFS2 manual commit i did and pull from http://oss.oracle.com/git/ocfs2-dev.git | 10:12 |
| fabbione | BenC: it will be easier to maintain in future | 10:12 |
| fabbione | i just can't get git to do it properly | 10:13 |
| BenC | ok | 10:13 |
| fabbione | hey | 10:14 |
| fabbione | Trying really trivial in-index merge... | 10:14 |
| fabbione | fs/Makefile: needs update | 10:14 |
| fabbione | fatal: Entry 'fs/Makefile' not uptodate. Cannot merge. | 10:14 |
| fabbione | Nope. | 10:14 |
| BenC | fabbione: next weekend my e3k will be available to do buildd and such | 10:14 |
| fabbione | this is the error i get from git | 10:14 |
| fabbione | basically it can't merge a file | 10:14 |
| BenC | but I can't let it be perm, because I need that box for doing debug | 10:14 |
| BenC | fs/Makefile must be modified | 10:15 |
| BenC | git-status | 10:15 |
| fabbione | and i don't understand how the hell i get to see the old, new files | 10:15 |
| fabbione | yeah git status was telling me that the file was modified | 10:15 |
| BenC | git-checkout -f will overwrite any modifications you have (if they are not valid) | 10:15 |
| BenC | git-ls-files -o -t | 10:15 |
| BenC | that will show you files that are "new" | 10:16 |
| fabbione | hmmm | 10:16 |
| fabbione | well basically i do a clone of our tree | 10:16 |
| fabbione | revert a commit | 10:16 |
| fabbione | pull from oracle | 10:16 |
| fabbione | i get that error | 10:16 |
| fabbione | i must be able to see the attempt merge to understand what to fix | 10:16 |
| fabbione | that's what i can't figure | 10:16 |
| BenC | then the revert needed merging to complete | 10:16 |
| fabbione | i sort of need to see where the conflict is | 10:17 |
| BenC | after the revert, do git-status | 10:17 |
| fabbione | the revert goes fine... | 10:17 |
| fabbione | git-status tells me nothing needs to be done | 10:17 |
| BenC | most likely, you need to open fs/Makefile, and fix any conflicts from the revert | 10:17 |
| BenC | doubt it, else it wouldn't do that | 10:17 |
| fabbione | i get the error on pull | 10:17 |
| fabbione | yeah there is an error in the revert, but i get to fix that and do the commit | 10:17 |
| BenC | fs/Makefile wouldn't be modified from the pull though | 10:17 |
| BenC | hmm, ok, I'll attempt it | 10:18 |
| fabbione | it needs to merge 2 lines | 10:18 |
| BenC | yeah, then do "git-commit" and it will finish the merge | 10:19 |
| BenC | s/merge/revert/ | 10:19 |
| fabbione | yup.. i am redoing it right now | 10:19 |
| fabbione | git clone ubuntu-2.6/ crap-2.6 | 10:19 |
| fabbione | defaulting to local storage area | 10:19 |
| fabbione | takes a little bit | 10:19 |
| fabbione | ok reverting now | 10:23 |
| fabbione | git revert b6d1b58933a2eec5bfc4d14bb733686e446e497f | 10:23 |
| fabbione | [SNIP} | 10:23 |
| fabbione | BenC: yeah it works now! thanks | 10:37 |
| fabbione | BenC: you should be able to pull from me | 10:50 |
| fabbione | OCFS2 integrated from oracle git repo | 10:51 |
| fabbione | dunno if it builds. | 10:51 |
| fabbione | but should.. it's the same version from 2 different sources | 10:51 |
| === CataEnry [n=cataenry@host204-30.pool8248.interbusiness.it] has joined #ubuntu-kernel | ||
| CataEnry | hi all | 11:01 |
| CataEnry | bye all | 11:25 |
| mjg59 | So, I've found what broke usplash | 11:48 |
| mjg59 | infinity: Can you take a look at http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff_plain;h=c465e05a03209651078b95686158648fd7ed84c5;hp=e764a20196f4e1b497a42fdc6e9d254e7ec290f2 and see if you have any idea why it might b0rk vga16fb? | 11:48 |
| mjg59 | (And, if possible, revert it and see if it fixes things for you) | 11:49 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!