[pve-devel] [RFC kernel 0/2] pve-kernel helper scripts for patch-queue management

[Thomas Lamprecht]

Am 04/03/2018 um 01:30 PM schrieb Fabian Grünbichler:
> this patch series introduces helper scripts for
> - importing the exported patchqueue into a patchqueue branch inside the
>    submodule
> - exporting the (updated) patchqueue from the patchqueue branch inside the
>    submodule
> - importing a new upstream tag into the submodule, optionally rebasing the
>    patchqueue
>
> potential for future extensions:
> - cherry-pick upstream commit(s) from linux-stable(-queue) or arbitrary
>    trees/repos into patchqueue
> - ... ? ;)

Hmm, if a git am of the old patchseries fails, which I caused by running 
your 4.15
example on the master (4.13) branch (makes no sense, but I did it just 
because
exactly this ^^), we reset branches and clean up but don't abort the am 
inside the
submodule, maybe that could be done too in the error_exit function, but 
this is really
just an edge case which is normally user caused.

Also running the script in an OK way, then stashing the result (see my 
answer to 2/2,
had no commit produced) and re-running the same command result in git am 
error:

# debian/scripts/import-upstream-tag submodules/ubuntu-artful 
patches/kernel Ubuntu-4.13.0-38.43 yes
checking for tag 'Ubuntu-4.13.0-38.43'
tag found

automatic patchqueue rebase enabled
previous HEAD: 23155b1c4c2fb5eececde1750aa9ba44a5da614b

creating patchqeueue branch 'auto_pq/Ubuntu-4.13.0-38.43'
Switched to a new branch 'auto_pq/Ubuntu-4.13.0-38.43'
importing patches from 'patches/kernel'
Applying: Make mkcompile_h accept an alternate timestamp string
[...]
Applying: mm/thp: Do not wait for lock_page() in deferred_split_scan()
error: patch failed: mm/huge_memory.c:2621
error: mm/huge_memory.c: patch does not apply
Patch failed at 0024 mm/thp: Do not wait for lock_page() in 
deferred_split_scan()
The copy of the patch that failed is found in: 
/root/sources/pve/pve-kernel/.git/modules/submodules/ubuntu-artful/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
failed to import patchqueue
cleaning up PQ branch 'auto_pq/Ubuntu-4.13.0-38.43'
HEAD is now at 23155b1c4c2f UBUNTU: Ubuntu-4.13.0-38.43
Deleted branch auto_pq/Ubuntu-4.13.0-38.43 (was f128a49ce123).