00:39 <derzahl> let me try to clarify

00:40 <derzahl> so I forked your kernel and can easily pull in new changes that you make. thats where I am now

00:41 <derzahl> there are other repositories on github that maintain various other kernel patches, for example https://github.com/ptr1337/kernel-patches/tree/master/5.17

00:43 <derzahl> is there a magic way for me to merge in patches like those and patches from other github repos and have them sync automatically?

00:43 <derzahl> or with the push of a button

00:45 <derzahl> i havent been able to find anything about github processing regular unix diff-type patches

00:45 <qzed> you could always add them as additional remotes and try to merge them, or use git cherry-pick (if it's a kernel tree)... otherwise use git am (or alternatively git apply)

00:45 <qzed> that could be more or less automated with some github actions I guess

00:46 <qzed> but will fail of course if there are conflicts

00:47 <derzahl> hmm ok. will all those commands understand what a .patch file is and apply it? rather thajust adding it to my repo as a file/

00:48 <qzed> git am will apply a patch with its original commit message (if generated by git itself), git apply should work on all kinds of patches but you need to commit manually

00:49 <derzahl> ok, thanks. ill give it a shot

00:49 <qzed> so for the repo you linked you could do something like `git am ../path/to/repo/*.patch` and that should apply all the patches in that directory

00:49 <derzahl> the if i want to pull in updates for thr patches themselves, is that simple to do?

00:50 <derzahl> ok awesome

00:51 <qzed> you probably want to apply the patches fresh each time they got updated, so something like: make a base branch without the patches then every time they get updated pull the patch repo and create new branch based on the base branch to which you apply those patches

00:52 <qzed> otherwise patches may be already applied (that's usually fine with git am) or partially applied (that's where git am can ask you to manually resolve conflicts)

00:53 <qzed> also: git am -3 often helps to resolve (some) conflicts (does a 3-way merge if it knows/can find the commit that the patches are based on)

00:54 <derzahl> ah, so nothing 'magic' that will just sync everthing

00:54 <qzed> not without some scripting, I guess

00:54 <derzahl> ok cool. ill see what I can do

00:54 <derzahl> thanks

00:55 <qzed> while things are often quite stable, also expect some breakage from time to time

00:55 <qzed> like for example if the patch repo has an outdated patch that has made it with some small (e.g. style) changes upstream

00:56 <qzed> trying to apply that can fail and cause git to complain

00:56 <derzahl> for sure. im already doing this in a PKGBUILD

00:56 <derzahl> pretty solid

00:56 <qzed> and at that point you'll have to manually resolve that

00:56 <qzed> nice!

00:56 <derzahl> that might be the best way to do it after all

00:57 <derzahl> i just thought maybe there was some git magic i could use

00:57 <qzed> probably xD

01:00 <derzahl> i can post my PKG build for the c630 if anyones interested. I have the kernel patched with ZFS and compiled bultin for ZFS root booting, mg-lru, cacule, etc. building with clang works and now im just trying to get LTO to work

01:00 <derzahl> also have a lot of unneeded stuff removed in my .config

03:57 <Dylanger> I sold my iPad Pro a week ago because I'm using my Duet 5 much more now that I actually trust it, viva aarch64-laptops!

18:14 <steev> derzahl: fwiw, you could always just split out my patches, and start from stable's linux-5.XX.y (which is what i do)

18:15 <steev> i'm wanting to read https://josefbacik.github.io/kernel/2021/10/18/lei-and-b4.html and https://people.kernel.org/monsieuricon/lore-lei-part-1-getting-started (and part 2)

18:15 <steev> and start doing that, because i know i've not always got the latest versions of patch sets