I don't want to fork any pre-made usercontent (if possible). I have Samsung 4.4.2, AOSP and kernel.org sources available that should result in my own custom kernel (that can be updated to latest -but same- mainline base).
The question is what are the best methods/workflows to merge them (to get a source that can be updated with kernel.org source)? I guess that's how people 'rebase' their kernels...
Or can i simply merge the official kernel.org updates directly into Samsung source?
Edit: I guess i've found the answer already. Mainline patches will be applied directly from mainline (kernel.org) indeed (see here)
with git apply
. For minor updates it shouldn't be necessary to 3-way diff the sources like i thought in the first place (like this)