yashsingh1/xdaforums huggingface dataset:
[Nexus 6 Android Development] apophis9283:
[MENTION=4231562]Yoinx[/MENTION] I got it finally, below are the files I need to fix. Not bad. This is gonna be easy

both modified: arch/arm/Kconfig

deleted by us: arch/arm/configs/shamu_defconfig

both added: arch/arm/crypto/.gitignore

both added: arch/arm/crypto/aesbs-core.S_shipped

both added: arch/arm/crypto/bsaes-armv7.pl

both added: arch/arm/crypto/sha256_glue.c

both modified: arch/arm/mach-msm/pcie.c

both added: build.config

both modified: drivers/cpufreq/cpufreq_stats.c

both modified: drivers/cpuidle/cpuidle.c

both modified: drivers/gpu/msm/adreno.c

both modified: drivers/gpu/msm/adreno_ringbuffer.c

both modified: drivers/gpu/msm/kgsl_pwrctrl.c

both modified: drivers/gpu/msm/kgsl_sync.c

both modified: drivers/input/touchscreen/atmel_mxt_ts_mmi.c

both modified: drivers/media/platform/msm/camera_v2/isp/msm_isp.h

both modified: drivers/media/platform/msm/vidc/msm_vdec.c

both modified: drivers/misc/Makefile

both modified: drivers/misc/qseecom.c

both added: drivers/misc/uid_cputime.c

both modified: drivers/net/wireless/bcmdhd/dhd.h

both added: drivers/net/wireless/bcmdhd/dhd_debug.h

both modified: drivers/net/wireless/bcmdhd/dhd_linux.c

both modified: drivers/net/wireless/bcmdhd/dhd_pcie.c

both modified: drivers/net/wireless/bcmdhd/dhd_sdio.c

both modified: drivers/power/smb135x-charger.c

both modified: drivers/usb/core/driver.c

both modified: drivers/usb/host/xhci-msm-hsic.c

both modified: drivers/video/msm/mdss/mdss_panel.h

both modified: fs/pstore/inode.c

both added: fs/pstore/pmsg.c

both modified: kernel/power/Kconfig

both modified: kernel/power/Makefile

both modified: kernel/power/suspend.c

both modified: kernel/sched/cputime.c

both modified: security/selinux/hooks.c

both modified: security/selinux/include/objsec.h

both modified: security/selinux/ss/services.c

Untracked files:

(use "git add <file>..." to include in what will be committed)

include/sound/q6core.h~android-msm-shamu-3.10-marshmallow
[Nexus 6 Android Development] apophis9283:
It should work with "M" now. But in my usual style I borked correcting the miss merges. Kinda blows but im one step closer
[Nexus 6 Android Development] :
One you're at that point, you're pretty close.

Make sure to install meld:

sudo apt-get install meld

Then set it as your merge tool.

git config --global merge.tool meld

Or whatever visual diff tool you like... I'm partial to meld.

Git should then prompt you to resolve the conflicts. For each file it will open meld with local/merged/remote and show you all the different lines for you to go through and see what you need on each one.

For the most part, if you didn't tweak any of those files, I'd just use the ones from m.
[Nexus 6 Android Development] apophis9283:
I just manually gedited them. Ive got a few errors. The big part is done
[Nexus 6 Android Development] :
Fair enough. The merge.tool thing is just a huge time saver. It's all about preference I guess.

At least you're making progress though.
[Nexus 6 Android Development] apophis9283:
Since it was easy enough to get them together im gonna try meld
[Nexus 6 Android Development] chipis:
Can this kernel works on M ?
[Nexus 6 Android Development] apophis9283:
I am working on it. Hopefully not too much longer
[Nexus 6 Android Development] apophis9283:
I would use meld. I forgot I pushed the commit to github. Ill work it out. I feel rawr because i pushed it
[Nexus 6 Android Development] apophis9283:
[MENTION=4231562]Yoinx[/MENTION] stuck on this. The code looks fine

drivers/cpufreq/cpufreq_stats.c:522:20: error: expected ';' before ')' token

size, GFP_ATOMIC);

^

drivers/cpufreq/cpufreq_stats.c:522:20: error: expected statement before ')' token

Ive gotten past all that now. adreno.c is throwing errors like a 2 year old throwing tantrums. Im working on it. Almost there
[Nexus 6 Android Development] apophis9283:
Every time i get adreno.c working, adreno_ringbuffer errors. Its like hell. Its never ending lmao
[Nexus 6 Android Development] buckmarble:
Look before that line. Probably missing a semi colon
[Nexus 6 Android Development] apophis9283:
Im past that. Adreno stuff is giving me issues.

I cant get passed the ringbuffer file. Done for the day
[Nexus 6 Android Development] :
I'll try to sync whatever you have pushed to git tonight and take a look. If not, I'll do it first thing in the morning.
[Nexus 6 Android Development] apophis9283:
I had an idea. Dont know if its gonna work. If not i will push everything so you have what ive done

Thanks for the help and encouragement. It gets so f'n frustrating. I would have given up the other day if it werent for you
[Nexus 6 Android Development] apophis9283:
Ok, so I have gotten past almost every error. avtimer.c is giving errors. I have to be getting close
[Nexus 6 Android Development] apophis9283:
Yoinx i havent pushed everything. Will do when i get home
[Nexus 6 Android Development] :
Sounds good. I'm cutting it short at the gym so I'll probably start looking at this in an hour or so. If it's not pushed by then, I can at least start looking at what's going on up to where you last pushed.
[Nexus 6 Android Development] apophis9283:
Ive pushed everything. Ive gotten far. Im kinda impressed with myself. Its just it keeps throwing errors. Its never ending
[Nexus 6 Android Development] :
Dunno where that came from.
[Nexus 6 Android Development] chopt51:
I thought you were going to quit?
[Nexus 6 Android Development] apophis9283:
I had every plan to. Yoinx talked me out of it
[Nexus 6 Android Development] apophis9283:
I will.
[Nexus 6 Android Development] apophis9283:
Using meld to merge 6.0 is awesome. I cant believe i didnt learn this tool earlier
[Nexus 6 Android Development] buckmarble:
I have another faster and cleaner way of doing this. Whenever I was in the same position you are, I grabbed a fresh clone of aosp source, added my old source as a remote to fetch the history, then used a git tool called smartgit. You import your source into it and you can grab all the commits you made on your old source and cherry pick them into the new clone with one click. There may be a few conflicts along the way, but at least you know exactly at which commit it failed on and you can look at it to fix it and move on. Once you're familiar with it, you can get a full rebase done in about 30 min.

http://www.syntevo.com/smartgit/
[Nexus 6 Android Development] apophis9283:
thats awesome. Im using meld now. Well learning meld. if it doesnt work ill try that. Thanks
[Nexus 6 Android Development] Mr_S:
Watching this thread, good work [MENTION=2995087]Apophis82[/MENTION]93 and [MENTION=4231562]Yoinx[/MENTION]

I'm loving this kernel and a m version would be awesome. It's nice to see the xda spirit alive and kicking. Apophis, you'll get there!
[Nexus 6 Android Development] goila:
I hope that we can get more in the future further build 5:11. I do not want to switch m still personally during Xposed is not finished
[Nexus 6 Android Development] apophis9283:
im getting ready to give this a shot. Might take a bit to figure out
[Nexus 6 Android Development] apophis9283:
This thread will remain open as long as 5.1 remains relevant

https://github.com/APOPHIS9283
[Nexus 6 Android Development] apophis9283:
This is only for 5.1. I fixed a lot of issues. Nothing new added. This is just so you can have a more stable kernel til you update to MM. I fixed conservativex, I broke it last build. Anyway, here it is enjoy

https://www.androidfilehost.com/?fid=24052804347834001
[Nexus 6 Android Development] evolishesh:
You rock!
[Nexus 6 Android Development] goila:
They are still present in the old problems. 1.7.0 is the most stable

an idea: could to be the msm mpdecision the default hotplug? dynamichotplug is in KA not visible. if it wants to use someone, could use the synapse+ukm
[Nexus 6 Android Development] XXX_YOlO_XXX:
Do you have any version for Android M? Any betas...

---------- Post added at 03:01 PM ---------- Previous post was at 02:59 PM ----------

Im want to be a tester.
[Nexus 6 Android Development] XXX_YOlO_XXX:
I can donate you about 50-100 dollars for beta tests.
[Nexus 6 Android Development] apophis9283:
At this point i have no plans. If sometime down the road i choose to try again i will update the op
[Nexus 6 Android Development] str8str:
I don't know what your saying. This build works great.

---------- Post added at 19:13 ---------- Previous post was at 19:11 ----------

Curious why the two ukm versions?
[Nexus 6 Android Development] apophis9283:
some people didnt like the one click governor setting. 4 is with it, 5 is without it
[Nexus 6 Android Development] ztotherad:
dude, don't quit on this awesome kernel! i definitely absolutely love this and would love to see it updated to 6.0
[Nexus 6 Android Development] apophis9283:
Ive tried. Its beyond me. Its not just a few clicks.
[Nexus 6 Android Development] apophis9283:
Heres what im looking at. trying to merge 6.0 into vortex. Now even if i get all those right. Theres still some hotplugs/governors that tend not to like 6.0. I can keep trying, but I think failure is in my future
[Nexus 6 Android Development] dirtyscout:
This is a very awesome kernel you've been working on and I would ****ing hate to see you quit working on it. This is the only thread I've chimed in on in quite a long time and all of my post are to say thanks and keep up the hard work.... Either way I would hate to see you abandon this project...... Thanks for what you've shared at a minimum I have enjoyed it from the first version released and it works on countless ROMs. :good:
[Nexus 6 Android Development] ztotherad:
I'd definitely keep trying and ask around to the other kernel devs. even if you didn't add all the governors and hotplugs back all at once i think it'd still be a kick ass kernel
[Nexus 6 Android Development] DreamFX:
+1
[Nexus 6 Android Development] str8str:
I have to say the last build is the best yet it's running great better than all the previous. Love it it's fast smooth just the way it should be. Don't give up just give things time to catch up take a break then go back at it with vengeance.
[Nexus 6 Android Development] apophis9283:
I didnt give up. Im there, it compiled except for the last little line. Im there. Im so happy i almost cried just need to figure this last error out ive tried for sometime, no luck. But this is the end of the line when compiling. Ill try and solve the last piece of the puzzle tomorrow.

LD drivers/usb/built-in.o

LD drivers/built-in.o

LINK vmlinux

LD vmlinux.o

MODPOST vmlinux.o

GEN .version

CHK include/generated/compile.h

UPD include/generated/compile.h

CC init/version.o

LD init/built-in.o

drivers/built-in.o: In function `ex_check_cpu':

sensors_ssc.c:(.text+0x36f934): undefined reference to `graphics_boost'

make: *** [vmlinux] Error 1

apophis9283@apophis9283-desktop ~/vortex $
[Nexus 6 Android Development] Mr_S:
Keep it up dude. I'm getting like 6-7 sot with 2 cores oc'ed max!

Keep faith!
[Nexus 6 Android Development] goila:
so, I played yesterday with cyanogenmod and the end result: 1.7.4 no longer works with the latest (no idea since when not working)

I think that relates to the ramdisk.

1.7.0 works flawlessly
[Nexus 6 Android Development] :
Normally is agree, but he uses the any kernel method so it just modifies your roms ramdisk.

It's probably something that they broke in the latest nightly that will be changed within a few nightlies. Cm typically breaks things all the time in their nightlies.
[Nexus 6 Android Development] goila:
Yes, that's why I do not understand. AICP is also cm base and has been operating since 1 week exclusively with the 1.7.0
[Nexus 6 Android Development] apophis9283:
I got it to compile. I would like to thank buckmarble and hellsgod. They put up with my complaining im thankful
[Nexus 6 Android Development] apophis9283:
Ok, so i just tried to flash it on lp it didnt work. Is there anyone running mm?

Give me a bit. Pushing stuff. I want to keep my lp code separate from marshmallow
[Nexus 6 Android Development] an21281:
Yes I'm running mm 6.0, let me know if I can be of any help...
[Nexus 6 Android Development] apophis9283:
Im gonna test first. Im pushing my source so i can keep lp and mm separate, so that will take a bit. If everything works and doesnt blow up my phone ill have a beta
[Nexus 6 Android Development] an21281:
Nice, good luck!
[Nexus 6 Android Development] str8str:
This is the first half day with the latest. Great job.
[Nexus 6 Android Development] apophis9283:
I couldnt get it to boot, so yet again I went to hellsgod. I needed to change the offsets in anykernel. Hope it boots now
[Nexus 6 Android Development] apophis9283:
It boots! Hopefully a beta today
[Nexus 6 Android Development] apophis9283:
All of my options are still coded in mm. But when I compile they dont show. Trying to figure out why

I just tested its because even updating anykernel its not flashing my kernel
[Nexus 6 Android Development] apophis9283:
[MENTION=2967322]buckmarble[/MENTION] I was using anykernel to flash my kernel, i updated the offsets but its still not flashing. Any ideas?
[Nexus 6 Android Development] apophis9283:
I got it flashing now its not booting. Maybe the toolchain
[Nexus 6 Android Development] apophis9283:
If someone knows logs this was the best i could do, maybe then i can figure out why its not booting

Heres the zip if anyone feels like helping. Meaning this does not boot. I say again it does not boot

http://pastie.org/10475859
[Nexus 6 Android Development] :
Unfortunately, the TWRP recovery log is next to worthless unless you're debugging something with TWRP directly. I thought that there was another log for the actual flashing portion... But can't recall.

Either way, when you say not booting. It doesn't error at all when flashing, then after the Google logo it just hangs at a black screen?

You may need to modified se policy stuff from chainfire.
[Nexus 6 Android Development] jolly_roger_hook:
Love this but now just need to get a version that works with M battery on m is better the lp but this would make it great I was getting almost 7.5 sot with this on lp
[Nexus 6 Android Development] apophis9283:
After you flash the kernel, it goes to boot logo, sits reboots shows boot logo. Its an endless cycle. Absolutely no errors when compiling
[Nexus 6 Android Development] apophis9283:
Im working on it. This thing has literally driven me mad. First it wouldnt merge, then after forever i finally got it only to discover it wont boot. If i didnt have bad luck, id have no luck at all
[Nexus 6 Android Development] :
Might be a long shot, but you could try downloading one of the working boot.img from chainfire. Manually unpack it, shove in your zImage and flash the boot.img itself to ensure nothing in your anykernel setup isn't causing an issue.
[Nexus 6 Android Development] apophis9283:
Id have to look into how to do that, I didnt have much luck before. Hellsgod gave me his anykernel so i stopped looking into it

although it gives me an idea
[Nexus 6 Android Development] :
It's basically the same way. You need to find mkboot, and the others... normally it will have a script that unpacks, saves the values, and reuses then when it repacks.

I mean, I doubt that's it... But it removes a variable.
[Nexus 6 Android Development] apophis9283:
its the kernel
[Nexus 6 Android Development] :
Do you maybe need to change an offset in the config/Def config?

I think if your run the make config, there's a spot in the gui for offsets.
[Nexus 6 Android Development] apophis9283:
I changed it in anykernel
[Nexus 6 Android Development] :
Yeah, that why I mentioned it.

In any kernel is changing the command that's built into the boot.img. I think you may need to change it in the kernel config too. And that command should be make menuconfig, but I honestly can't remember if it's embedded in there like I'm thinking.
[Nexus 6 Android Development] apophis9283:
I just looked at other defconfigs, nothing there. Ive been tying stuff with no luck
[Nexus 6 Android Development] str8str:
I'm definitely not changing roms or kernels for quite a while. Your 10th build of bliss and last lp version of vortex is to good to switch. Lol
[Nexus 6 Android Development] apophis9283:
Well now it doesnt seem to be flashing. im using the same zip i used earlier to flash and it hung so i knew it flashed

Its not the defconfig. Whatever it is, its confusing as hell

I may have to start over.
[Nexus 6 Android Development] str8str:
Man hope not
[Nexus 6 Android Development] apophis9283:
Heres an update. I rebased. I had to remove the following. Tcp cdg, fifo scheduler and dynamic hotplug. I havent added any governors or tweaks yet. It gets to the boot animation but im thinking its an anykernel issue
[Nexus 6 Android Development] crashnova:
[MENTION=4392154]apophis9283[/MENTION] is the link down?
[Nexus 6 Android Development] apophis9283:
https://www.androidfilehost.com/?fid=24052804347834001

enjoy
[Nexus 6 Android Development] DreamFX:
This works on M?
[Nexus 6 Android Development] :
No, he's still working on getting a kernel that boots properly on M.

These things take time :p
[Nexus 6 Android Development] SanJoseCA:
Patience.... Waiting Patiently really pays off !!
[Nexus 6 Android Development] apophis9283:
Since LP is still relevant im keeping this thread open. But I offer no guarantees that I will have a Marshmallow kernel. I am working on it though
[Nexus 6 Android Development] kronikings:
Hey man I don't really know how to code, do you mind if I merge all your code into a kernel I'm thinking about making?
[Nexus 6 Android Development] Robin Son:
hey apophis

Will your kernel work on Sokp 5.1.1 rom?

I have tried to flash zip and boots ever time but your kernel is not there so

am i installing wrong or its not for this rom?
[Nexus 6 Android Development] DreamFX:
Aokp is dead. Don't get me all excited that it has been resurrected from the dead.
[Nexus 6 Android Development] Robin Son:
Lol thanks dreamfx,

hey apophis

Will your kernel work on Sokp 5.1.1 rom?

I have tried to flash zip and boots ever time but your kernel is not there so

am i installing wrong or its not for this rom?
[Nexus 6 Android Development] apophis9283:
Should work fine. Not sure why it wouldnt
[Nexus 6 Android Development] apophis9283:
I would prefer you not use this as a base, but feel free to cherry pick. Kernel source is one of those things. I cant really stop you
[Nexus 6 Android Development] kronikings:
Do you use HellsCore as a base?
[Nexus 6 Android Development] apophis9283:
No. the original path of this kernel was in blisspop. Then I decided to take over. Well I decided I wanted as many features as possible, which is what set my kernel apart from others. Which is why I want to protect it. The original base was liquid smooth kernel.
[Nexus 6 Android Development] apophis9283:
As if the kernel update wasnt enough, either my mobo or cpu went out today. I dont imagine it will be too terribly long to fix. Then we can get vortex marshmallow rollinh
[Nexus 6 Android Development] apophis9283:
Nothing was broken. I re sat the cpu as well as cleaned it off and reapplied thermal paste. Re sat the water block as well as leaning it off. Cleaned out/off my case and bam, we are good to go
[Nexus 6 Android Development] str8str:
Great job brother

---------- Post added at 20:38 ---------- Previous post was at 20:35 ----------

Yes it works fine on sokp I've been using it for weeks.

---------- Post added at 20:40 ---------- Previous post was at 20:38 ----------

He means sokp. But I wonder what happened to aokp it was a good rom
[Nexus 6 Android Development] Robin Son:
My bad str8str, I didn't realize your install running Sokp rom.

I'm using twrp to install and it's successful every time but i'm not seeing the kernel after my phone boots.

How did you get it to install, did you wipe dalvik cache only before reboot??

Or did you install with fresh install?:confused:
[Nexus 6 Android Development] :
They mostly all went to different projects.
[Nexus 6 Android Development] apophis9283:
The lead of AOKP went to CM. Roman Birg.....
[Nexus 6 Android Development] apophis9283:
You all will be glad to know that yoinx is my other team member. Hes really great to work with
[Nexus 6 Android Development] str8str:
Sorry took a while but I just flashed the zip in twrp no wipe necessary. Make sure if your on sokp you're using the lp version not mm. Version 174 was the last and most stable imo
[Nexus 6 Android Development] apophis9283:
Were getting there. Im so glad we made a team. He has been fn awesome
[Nexus 6 Android Development] Shilalygawd:
Just wanna say your kernel was one of my favorites due to all of the options and stability. Looking forward to seeing you guys solve the problems you're having with MM!
[Nexus 6 Android Development] apophis9283:
Its nice to have a "team" now. Were hoping to bring all the joy you had with lp kernel to mm kernel
[Nexus 6 Android Development] Shilalygawd:
Sweet, dude! If you ever need a beta tester feel free to give me a shout. I'm always experimenting with this phone lol. I have a bit of a problem with things staying constant ?
[Nexus 6 Android Development] :
SO just an update for folks... here's where we are currently.

we have all but I think 3 or 4 governors working again. The hotplugs are all there. the GPU simple_demand and adreno idler are as well. I dont believe we've started moving in I/O schedulers or congestion controls. We're working on toolchain optimizations right now as well as OC freqs, and getting those to boot properly. Then of course all of the tweaks that apophis had in the LP version.

Unfortunately, some of the code changed in MM, and alot of the old tweaks aren't direct carry-overs. Some need to be modified and I believe some are actually regressions in code. Often, people will just bring everything forward from the previous kernel... which isn't necessarily bad. But at the same time, it's possible that you're overwriting files with code from 2,3,4 years ago that isn't actually providing any benefit anymore.

But, I've been an idiot all day and forgot to enable ccache in my build script. So... everytime I've swapped toolchains or had to build clean, it's been slow. I don't have a super powerful laptop :)

Edit: FML. With ccache, my clean builds just went from like 20+ minutes, to like 30 seconds. This should move along a lot faster (on my part at least), that time was slowing me down a lot.

tldr; it takes time to get this all sorted and actually put out something that works well. So be patient, goodness is coming ;)
[Nexus 6 Android Development] apophis9283:
Just in case anyone missed it, yoinx is part of the team.. hehe even if theres only 2 of us. So he will be running this thread with me
[Nexus 6 Android Development] evolishesh:
Great to hear that!
[Nexus 6 Android Development] goila:
great! We still get a stable L build too?
[Nexus 6 Android Development] :
Was something about the last builds that apophis put out for L unstable for you?

Once the new sources are out, there's not much reason to continue building for the old ones tbh. Unless there are issues to fix or amazing new features to add.
[Nexus 6 Android Development] goila:
with stock is okay, but on aicp, cm, temasek not working properly
[Nexus 6 Android Development] jcrompton:
which profile working good for you?
[Nexus 6 Android Development] apophis9283:
Im actually using conservativex
[Nexus 6 Android Development] jcrompton:
I'm trying it now with Intelliplug enabled ...... Seems a little stuttery with surfing, ie Tapatalk
[Nexus 6 Android Development] apophis9283:
Ive noticced that with intelli plug. My phone does terrible using it. I used bricked. Maybe Ineed to make sure I have the latest stuff for intelli_plug
[Nexus 6 Android Development] MrSplaat:
Still no go on Pure Nex :(
[Nexus 6 Android Development] rignfool:
What is your runque threshold set too...

I noticed anything greater than 2000 leads to stutters and lags
[Nexus 6 Android Development] apophis9283:
Im looking for that commit i saw now
[Nexus 6 Android Development] apophis9283:
compiling now. The dev from hells kernel was awesome enough to let me have an anykernel zip. So it should work on any rom. Ill get it together and what not and get a changelog together.