[Moto Maxx General] fgl27:
I recommend you to start over and learn how to use git properly, the tool is really good the way you are doing manually is cause problem I did not go to everyone on yours repo changes but regarding this "mmap_rnd_bits" for a example I pull the changes for "mmap_rnd_bits" on nougat check the path is there and using git to check diff of the file from my repo and yours repo to the file "kernel/sysctl.c" in yours is wrong here the diff

https://github.com/bhb27/BHB27Kernel/commit/6637937d11d32e0e93801fd4382dcf2462c213bb

you put the changes on the wrong table, and as you are not using git properly you may have commit others error and they are causing problem that none one has any idea on how to fix...

to pull changes from others repo is very simple just use this

git fetch https://github.com/repo_ful_link/ branch && git cherry-pick commit_hash

if multi commit you grab the oldest and the latest and do this

git fetch https://github.com/repo_ful_link/ branch && git cherry-pick old_commit_hash^..newest_commit_hash

on the midle of the commits are ^.. (a circumflex accent and two dots)

you can just click on the clipboard symbol of a commit in github page to copy the hash and past on the txt or wherever you are using to copy/past from to

here a sample

pulling one single commit from my main branch

git fetch https://github.com/bhb27/BHB27Kernel/ N_c && git cherry-pick e4ce70eaaa49762af955e04e057abe9276d68636

pulling a lot

git fetch https://github.com/bhb27/BHB27Kernel/ N_c && git cherry-pick e4ce70eaaa49762af955e04e057abe9276d68636^..e6f8b5538e131b829b09605f42158fa682a0f882

if the commit complete without warning go to the next.

if it conflict git will warn about it on that case after the conflic give the command

git status

it will show you what file is the problem and the commit small hash, in case of doing a lot o commit you copy that small hash and use ctrl+f on the github page to search for that commit small hash (or commit title as it shows) then you use the command

git cherry-pick --abort

to abort all the changes, and redo the "a lot of commits" using the previously commit from the one that fail and push to the repo

now to the fail commit there is two options

first is to use github git history search on the conflict file opening the file from the original commit and do on the same file on the repo you are trying to pull that from, cross check history to see what changes happen before that one failing one to check if you may already have that one commit or if there is commit before that one that are relevant (analysis the previously not existent changes one by one to see if they are need or not for apq8084) and you pull those, then if all good do the fail one...

if the change are not relevant or they may cause others problem (as some changes are very device specific) then do one commit using the fail commit, but before you do, open the files that conflict then do the commit, go to the files that conflict using gedit text file editor (don't reload I'd it ask you to) and do the changes manually then save gedit may warn about changes to the file doing by another user or something like that just force save..

then to fix the conflict as you already fix the file run

git add --all && git commit

crt+o and ctrl+x to save and push.

I don't remember if the below works, but if does it commit witout the need of "crt+o and ctrl+x" the you just push it

git add --all && git commit --no-edit

on all the two cases make shore to check the conflict files with yours on git looking the mod commit vs the original...

On some cases the problem is because yours repo have a change that the one you are pulling from doesn't have, then in those case if the commit you have directly changes things that the conflict one also changes you need to analysis if is need to revert the extra one or do manually the new, some cases there is no relation on the extra commit with the new but git conflict any way so you can just do it manually for the conflicted files

most changes will not conflict and takes seconds to cherry-pick (when the sources are diferente the first cherry-pick will pull the others source to internal git cache so that takes some time depende on how diferente the source are**)a commit versus how many time can take some one to manually do those very big changes

** that is way I have that kernel_apq8084 repo with branches from others devices because if you already have the branch you are cherry-pick from on the repo is not need to cache anything, on my local machine I have both repo "kernel_apq8084" and "BHB27Kernel" and "BHB27Kernel" is clone using reference from the "kernel_apq8084" so it doesnot show in github all the branches in both but in my local machine is like I have all the branches of "kernel_apq8084" and "BHB27Kernel" on the same repo of "BHB27Kernel", make my life easier on days of slow internet

to use reference you just clone one repo then the other you add --reference path_of_reference_local_repo to the end of the clone command, this is not needed to do, just posting here as a reference to all that can be done to help git related things

any way try to check all that and learn those things so the repo have all the changes the correct way to prevent going after bugs that are there because ctrl-c ctrl-v errors...

in doubt let me know, btw as I'm used to it to all of that I may have miss something or my explanation is not perfect so when you try all that if something fail try google search as git is a very common thing, there is a lot of tutorial about it, if google doesn't help try me... :good: