Skip to content

[CIQ 6.12.y] Rebase ciq-6.12.y to v6.12.16 from v6.12.15 #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 0 commits into from
Apr 3, 2025

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Apr 2, 2025

Rebase ciq-6.12.y ontop of v6.12.16 we have wanted to do rebases so that its obvious that our content is dangling off the vX.y.z from GKH. However this can not take additional updates.

We will see how this goes in the future.

Build

/mnt/code/kernel-src-tree
  CLEAN   arch/x86/crypto
  CLEAN   arch/x86/entry/vdso
  CLEAN   arch/x86/kernel/cpu
  CLEAN   arch/x86/kernel
  CLEAN   arch/x86/kvm
  CLEAN   arch/x86/purgatory
  CLEAN   arch/x86/realmode/rm
  CLEAN   arch/x86/tools
  CLEAN   arch/x86/lib
  CLEAN   certs
  CLEAN   crypto/asymmetric_keys
  CLEAN   drivers/gpu/drm/radeon
  CLEAN   drivers/scsi
  CLEAN   drivers/tty/vt
  CLEAN   drivers/video/logo
  CLEAN   init
  CLEAN   kernel/debug/kdb
  CLEAN   kernel
  CLEAN   lib/raid6
  CLEAN   lib/test_fortify
  CLEAN   lib
  CLEAN   net/wireless
  CLEAN   security/selinux
  CLEAN   usr/include
  CLEAN   usr
  CLEAN   .
  CLEAN   scripts/basic
  CLEAN   scripts/dtc
  CLEAN   scripts/genksyms
  CLEAN   scripts/kconfig
  CLEAN   scripts/mod
  CLEAN   scripts/selinux/genheaders
  CLEAN   scripts/selinux/mdp
  CLEAN   scripts
  CLEAN   include/config include/generated arch/x86/include/generated .config .config.old certs/signing_key.pem certs/x509.genkey
[TIMER]{MRPROPER}: 7s
x86_64 architecture detected, copying config
'ciq/configs/kernel-x86_64.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b"
Making olddefconfig
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  LEX     scripts/kconfig/lexer.lex.c
  YACC    scripts/kconfig/parser.tab.[ch]
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  GEN     arch/x86/include/generated/asm/orc_hash.h
  WRAP    arch/x86/include/generated/uapi/asm/bpf_perf_event.h

[SNIP]

  BTF [M] net/qrtr/qrtr.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
[TIMER]{BUILD}: 1897s
Making Modules
  SYMLINK /lib/modules/6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+/build
  INSTALL /lib/modules/6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+/modules.order

[SNIP]

  SIGN    /lib/modules/6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+/kernel/net/qrtr/qrtr-mhi.ko
  DEPMOD  /lib/modules/6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+
[TIMER]{MODULES}: 37s
Making Install
  INSTALL /boot
[TIMER]{INSTALL}: 23s
Setting Default Kernel to /boot/vmlinuz-6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 7s
[TIMER]{BUILD}: 1897s
[TIMER]{MODULES}: 37s
[TIMER]{INSTALL}: 23s
[TIMER]{TOTAL} 1969s
Rebooting in 10 seconds

Kselftests

$ grep '^ok ' 6.12.15-_jmaple__sb_ciq-6.12.y-4e5411d06b62+.kselftest.log | wc -l
522

$ grep '^ok ' 6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+.kselftest.log | wc -l
522

6.12.15-_jmaple__sb_ciq-6.12.y-4e5411d06b62+.kselftest.log
6.12.16-_jmaple__rebase_ciq-6.12.y-8bf3f20ec85b+.kselftest.log

@PlaidCat PlaidCat changed the title {jmaple} rebase no mods ciq 6.12.y [CIQ 6.12.y] Rebase ciq-6.12.y to v6.12.16 from v6.12.15 Apr 2, 2025
@PlaidCat PlaidCat self-assigned this Apr 2, 2025
@PlaidCat PlaidCat marked this pull request as ready for review April 2, 2025 23:31
Copy link

@thefossguy-ciq thefossguy-ciq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚤

@PlaidCat PlaidCat merged commit 9dfea6b into ciq-6.12.y Apr 3, 2025
6 checks passed
@PlaidCat PlaidCat deleted the {jmaple}_rebase_no_mods_ciq-6.12.y branch April 3, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants