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

[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
- ... ? ;)

applicabale for pve-kernel-4.15 and master

sample run on top of current pve-kernel-4.15 for importing Ubuntu-4.15.0-14.15,
including rebasing the queue (and dropping two patches which have been applied
upstream):

----------------------
$ debian/scripts/import-upstream-tag submodules/ubuntu-bionic patches/kernel Ubuntu-4.15.0-14.15 yes
checking for tag 'Ubuntu-4.15.0-14.15'
tag not found, fetching and retrying
>From git://git.proxmox.com/git/mirror_ubuntu-bionic-kernel
 * [new tag]                   Ubuntu-4.15.0-14.15 -> Ubuntu-4.15.0-14.15
tag found

automatic patchqueue rebase enabled
previous HEAD: 6dc5db97022239a3ce21df3f6a84dea5cdff1999

creating patchqeueue branch 'auto_pq/Ubuntu-4.15.0-14.15'
Switched to a new branch 'auto_pq/Ubuntu-4.15.0-14.15'
importing patches from 'patches/kernel'
Applying: Make mkcompile_h accept an alternate timestamp string
Applying: bridge: keep MAC of first assigned port
Applying: pci: Enable overrides for missing ACS capabilities (4.15)
Applying: kvm: disable default dynamic halt polling growth
Applying: ocfs2: make metadata estimation accurate and clear
Applying: ocfs2: try to reuse extent block in dealloc without meta_alloc
Applying: mm/shmem: do not wait for lock_page() in shmem_unused_huge_shrink()
Applying: mm/thp: Do not wait for lock_page() in deferred_split_scan()

rebasing patchqueue on top of 'Ubuntu-4.15.0-14.15'
First, rewinding head to replay your work on top of it...
Applying: Make mkcompile_h accept an alternate timestamp string
Applying: bridge: keep MAC of first assigned port
Applying: pci: Enable overrides for missing ACS capabilities (4.15)
Applying: kvm: disable default dynamic halt polling growth
Applying: ocfs2: make metadata estimation accurate and clear
Applying: ocfs2: try to reuse extent block in dealloc without meta_alloc

clearing old exported patchqueue
exporting patchqueue using 'git format-patch [...] Ubuntu-4.15.0-14.15..
cleaning up PQ branch 'auto_pq/Ubuntu-4.15.0-14.15'
HEAD is now at 6dc5db970222 UBUNTU: Ubuntu-4.15.0-13.14
Deleted branch auto_pq/Ubuntu-4.15.0-14.15 (was 9047121a601c).

checking out 'Ubuntu-4.15.0-14.15' in submodule

committing results
[pve-kernel-4.15 22f0ef8] update sources to Ubuntu-4.15.0-14.15
 1 file changed, 1 insertion(+), 1 deletion(-)
[pve-kernel-4.15 9a410ef] rebase patches on top of Ubuntu-4.15.0-14.15
 3 files changed, 3 insertions(+), 152 deletions(-)
 delete mode 100644 patches/kernel/0007-mm-shmem-do-not-wait-for-lock_page-in-shmem_unused_h.patch
 delete mode 100644 patches/kernel/0007-mm-thp-Do-not-wait-for-lock_page-in-deferred_split_s.patch

$ git log --stat --format=medium origin/pve-kernel-4.15..
commit 9a410ef6f15cb089b50212c6d73e0718447735ac
Author: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Date:   Tue Apr 3 13:10:59 2018 +0200

    rebase patches on top of Ubuntu-4.15.0-14.15
    
    (generated with debian/scripts/import-upstream-tag)
    
    Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>

 ...overrides-for-missing-ACS-capabilities-4..patch |   6 +-
 ...-not-wait-for-lock_page-in-shmem_unused_h.patch | 103 ---------------------
 ...ot-wait-for-lock_page-in-deferred_split_s.patch |  46 ---------
 3 files changed, 3 insertions(+), 152 deletions(-)

commit 22f0ef84aa01191fe751ef00a6de1f3eb7ebade6
Author: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Date:   Tue Apr 3 13:10:59 2018 +0200

    update sources to Ubuntu-4.15.0-14.15
    
    (generated with debian/scripts/import-upstream-tag)
    
    Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>

 submodules/ubuntu-bionic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7ef647bc07ca719b1f0b2c1a05c43de56cbbebc
Author: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Date:   Tue Apr 3 11:16:30 2018 +0200

    debian/scripts: add import-upstream-tag
    
    Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>

 debian/scripts/import-upstream-tag | 115 +++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

commit 93fff928143b775f2ffa47840cca26e053e5cfed
Author: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Date:   Tue Apr 3 11:16:06 2018 +0200

    debian/scripts: add patchqueue scripts
    
    Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>

 debian/scripts/export-patchqueue | 30 ++++++++++++++++++++++++++++++
 debian/scripts/import-patchqueue | 28 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
----------------------

Fabian Grünbichler (2):
  debian/scripts: add patchqueue scripts
  debian/scripts: add import-upstream-tag

 debian/scripts/export-patchqueue   |  30 ++++++++++
 debian/scripts/import-patchqueue   |  28 +++++++++
 debian/scripts/import-upstream-tag | 115 +++++++++++++++++++++++++++++++++++++
 3 files changed, 173 insertions(+)
 create mode 100755 debian/scripts/export-patchqueue
 create mode 100755 debian/scripts/import-patchqueue
 create mode 100755 debian/scripts/import-upstream-tag

-- 
2.14.2