| 00:29.51 | hipboi | mnemoc: sorry, i went home early yesterday |
| 00:32.38 | mnemoc | hipboi: :) |
| 00:32.47 | mnemoc | hipboi: I'm just about going to sleep :p |
| 00:34.33 | mnemoc | hipboi: I'm sanitizing your 2.6.36. step1 (at https://github.com/amery/linux-allwinner, branch allwinner-v2.6.36-android-step1) might be already much easier to rebase upon newer versions |
| 00:35.05 | mnemoc | it's rebased upon the latest android's kernel-common and merges where turned into normal commits |
| 00:36.16 | mnemoc | I'm currently fighting to clean trailing ^Ms, trailing whitespace, and reencoding chinese into UTF-8... but that's step 2 |
| 00:37.06 | mnemoc | note this is done across the history, rewriting it. not at the HEAD in a single commit |
| 00:37.50 | mnemoc | somehow git-filter-branch has been playing tricks with me all day :-/ |
| 00:38.00 | hipboi | mnemoc: i can help with step 2 |
| 00:40.43 | hipboi | mnemoc: what do you mean by done across the history? |
| 00:41.15 | mnemoc | hipboi: there is a tool called `git filter-branch` that rewrites the history |
| 00:41.30 | mnemoc | hipboi: making mistakes as they never happened |
| 00:41.45 | hipboi | mnemoc: ok, i see |
| 00:42.30 | hipboi | mnemoc: can see what history was modified? |
| 00:42.39 | mnemoc | I'm applying this script http://dpaste.com/689977/ to every commit in -step1 |
| 00:43.12 | mnemoc | -step1 already has modified history, you can look there |
| 00:43.57 | mnemoc | that turned a hell of merges into a linear sequence of commit which can be easily be applied into anything |
| 00:44.35 | mnemoc | step2 tries to sanitize those commits removing trailing \r and trailing white spaces |
| 00:46.17 | hipboi | ok, i see |
| 00:48.13 | mnemoc | btw, did you receive the patches I mailed you to build standby.bin as part of the kernel? |
| 00:49.39 | hipboi | yes |
| 00:50.01 | hipboi | i was trying to find a way to apply it |
| 00:50.35 | mnemoc | hipboi: one easy way is to add my repo as an extra remote and then cherry-pick them |
| 00:51.27 | hipboi | ok, i'll try |
| 00:51.27 | mnemoc | those mails are supposed to be applied using `git am` but it's not something natural for most people |
| 00:52.25 | mnemoc | hipboi: the 'allwinner/amery/lichee-v2.6.36-dev' branch of my repo stands upon your public one |
| 00:52.58 | hipboi | yes, i know it |
| 00:53.07 | mnemoc | :) |
| 00:53.51 | mnemoc | btw, gcc 4.6 shows quite a bunch of good-to-fix warnings |
| 00:56.20 | hipboi | ok, i'll take a look at it |
| 00:57.11 | hipboi | mnemoc: btw, do you live in Spain ? |
| 00:57.18 | mnemoc | yes |
| 00:57.39 | hipboi | what's the time zone in Spain |
| 00:58.03 | mnemoc | central european, almost 2am currently |
| 00:58.22 | hipboi | ok, i see |
| 00:59.21 | hipboi | i think you need to go to sleep now |
| 00:59.36 | mnemoc | yup :) |
| 00:59.44 | hipboi | good night |
| 01:00.08 | mnemoc | I just left running my last-for-tonight attempt on getting step2 rewritten |
| 01:00.26 | mnemoc | takes around 1.5h to process the 1003 commits :-/ |
| 01:00.55 | hipboi | good |
| 01:00.55 | mnemoc | good night! |
| 03:30.36 | ManoftheSea | hey, evening. |
| 03:30.55 | ManoftheSea | the calxeda server chip is so beastly. |
| 03:31.01 | ManoftheSea | And the 4 SoC card? |
| 03:32.33 | ManoftheSea | sad it doesn't have graphics. |
| 04:02.25 | A2Sheds | well you can add a PCIe GPU |
| 05:03.03 | ManoftheSea | I'm not clear on the power cost. |
| 06:07.05 | *** join/#arm-netbook mikey_w (~mike@pool-74-110-218-2.rcmdva.fios.verizon.net) |
| 06:32.06 | *** join/#arm-netbook mikey_w (~mike@pool-74-110-218-2.rcmdva.fios.verizon.net) |
| 07:35.26 | *** join/#arm-netbook hipboi (~hipboi@221.4.213.95) |
| 07:55.12 | mnemoc | hipboi: hello, are you applying the patch upon the same published branch or something sigthly different? (merged for example). it should be simple to solve the conflict manually, after all it's just a rename |
| 07:55.32 | mnemoc | hipboi: if not you could cherry-pick the changes |
| 08:34.40 | hipboi | mnemoc: hi |
| 08:35.31 | hipboi | mnemoc: the network in our office is very slow to github |
| 08:36.36 | hipboi | mnemoc: fetching at the speed of 9KiB/s |
| 08:37.03 | mnemoc | hipboi: if you want I can guide you with the git steps to resolve the conflict on query (private message) |
| 08:37.52 | hipboi | mnemoc: the problem is after applying the patch failed |
| 08:38.06 | mnemoc | hipboi: that's called a conflict :) |
| 08:38.15 | hipboi | mnemoc: there's nothing modified |
| 08:38.19 | mnemoc | uhm |
| 08:38.22 | hipboi | no conflicts |
| 08:38.36 | mnemoc | `git status` is empty?? |
| 08:38.43 | hipboi | yes |
| 08:38.50 | mnemoc | :-/ |
| 08:39.39 | mnemoc | that is very weird |
| 08:40.00 | mnemoc | then why would it ask you to resolve it and the `git am --continue` ... |
| 08:40.19 | hipboi | yes... |
| 08:45.31 | mnemoc | hipboi: how long did it take you to push that public branch in the first place?? :-/ |
| 08:46.10 | hipboi | it's not me |
| 08:46.26 | mnemoc | git remote add + git fetch should not grab the whole linux tree, only the newer part |
| 08:46.38 | mnemoc | git clone will grab the whole fat thing |
| 08:46.46 | hipboi | yes |
| 08:47.07 | hipboi | i got %71 now, 173.37MB |
| 08:49.23 | hipboi | i need to fetch 14MB more data |
| 08:50.31 | hipboi | about 25 minutes to finish |
| 08:50.39 | mnemoc | gosh |
| 08:51.44 | mnemoc | it's not a critical contribution anyway, so I suppose we can wait for other day, don't get distracted with this from your real duties |
| 08:52.06 | hipboi | yes, i know |
| 08:53.08 | hipboi | the spring festival is approaching |
| 08:53.27 | mnemoc | hipboi: traveling? :) |
| 08:53.47 | hipboi | some have already left the office and go home |
| 08:54.22 | hipboi | yes, i will go back to my hometown and have some days off |
| 08:54.29 | hipboi | about one week |
| 08:55.30 | mnemoc | well deserved family time :) |
| 08:56.18 | mnemoc | I hope you have a very very good week without much transportation troubles |
| 08:56.59 | hipboi | oh, transportation is a big problem in China every this time of year |
| 09:29.55 | *** join/#arm-netbook xvilka (~xvilka@unaffiliated/xvilka) |
| 10:15.19 | *** join/#arm-netbook gordan (~gordan@31.106.233.96) |
| 10:55.43 | *** join/#arm-netbook gordan (~gordan@31.106.233.96) |
| 11:25.47 | *** join/#arm-netbook gordan (~gordan@31.106.233.96) |
| 18:53.28 | *** join/#arm-netbook gordan (~gordan@78-86-195-86.zone2.bethere.co.uk) |