Skip to content
Snippets Groups Projects

{main,community}/linux-*: enable new community options

Merged Imported Administrator requested to merge kconfig-community-more into master
All threads resolved!

For postmarketOS/pmbootstrap!2216

Edited by Administrator

Merge request reports

Checking pipeline status.

Approved by

Merged by AdministratorAdministrator 2 years ago (Nov 1, 2022 3:53pm UTC)

Merge details

  • Changes merged into master with c4fac0ad.
  • Deleted the source branch.

Pipeline #205164 passed

Pipeline passed for c4fac0ad on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator added 16 commits · Imported

    added 16 commits

    • 2aad100a...eafbfdc9 - 6 commits from branch master
    • a3beab8b - main/linux-postmarketos-allwinner: enable new community options
    • 8c677282 - community/linux-nokia-n900: enable new community options
    • f441167d - community/linux-pine64-pinephonepro: enable new community options
    • b768472d - community/linux-postmarketos-exynos4: enable new community options
    • d8da57e4 - community/linux-postmarketos-omap: enable new community options
    • f7b10b01 - community/linux-postmarketos-qcom-msm8916: enable new community options
    • 76c83cd0 - community/linux-postmarketos-qcom-msm8996: enable new community options
    • 60108754 - community/linux-postmarketos-qcom-sdm845: enable new community options
    • 4652cdcc - community/linux-postmarketos-qcom-sm6350: enable new community options
    • f5122868 - community/linux-samsung-espresso3g: enable new community options

    Compare with previous version

    By Luca Weiss on 2022-10-20T12:35:09

  • Administrator resolved all threads · Imported

    resolved all threads

    By Luca Weiss on 2022-10-20T12:53:00

  • Administrator mentioned in merge request !3335 (closed) · Imported

    mentioned in merge request !3335 (closed)

    By Luca Weiss on 2022-10-21T14:26:04

  • Author Owner

    Sorry that we couldn't merge this earlier and there's big conflicts now, but I think prioritizing the security updates for the kernels first was a good reason. However they are all merged now, so do you want to rebase and we try to get this in ASAP?

    Thanks so much for the work you've put into this!

    By Oliver Smith on 2022-10-24T06:56:49

  • Author Owner

    Maybe it's worth investing a little time at this point to add some pmbootstrap code that automatically enables the kernel options if you tell it to do so. (With proper dependencies, you know, not just change one line in the config. By calling the kernel scripts, I think merge_config.sh could be used?) This would save so much time with adjusting all the kernel configs.

    By Oliver Smith on 2022-10-24T07:15:31

    Edited by Administrator
  • Administrator
  • Administrator added 50 commits · Imported

    added 50 commits

    • f5122868...930d8eca - 42 commits from branch master
    • 766dc605 - main/linux-postmarketos-allwinner: enable new community options
    • cd4e7a68 - community/linux-nokia-n900: enable new community options
    • 08edbf48 - community/linux-pine64-pinephonepro: enable new community options
    • ff05938d - community/linux-postmarketos-exynos4: enable new community options
    • 2e6ff031 - community/linux-postmarketos-omap: enable new community options
    • b38a68cd - community/linux-postmarketos-qcom-msm8916: enable new community options
    • d13bc55e - community/linux-postmarketos-qcom-msm8996: enable new community options
    • 5d87c2c7 - community/linux-postmarketos-qcom-sm6350: enable new community options

    Compare with previous version

    By Luca Weiss on 2022-10-31T20:20:37

  • Administrator resolved all threads · Imported

    resolved all threads

    By Luca Weiss on 2022-10-31T20:20:42

  • Author Owner

    Rebased!

    By Luca Weiss on 2022-10-31T20:20:49

  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2022-11-01T15:45:33

  • Administrator added 8 commits · Imported

    added 8 commits

    • 0948a165 - main/linux-postmarketos-allwinner: enable new community options (MR 3560)
    • bbce9461 - community/linux-nokia-n900: enable new community options (MR 3560)
    • 76f5a4ab - community/linux-pine64-pinephonepro: enable new community options (MR 3560)
    • 9a462d37 - community/linux-postmarketos-exynos4: enable new community options (MR 3560)
    • d49ecb9d - community/linux-postmarketos-omap: enable new community options (MR 3560)
    • 9ecbd62f - community/linux-postmarketos-qcom-msm8916: enable new community options (MR 3560)
    • 5db3c291 - community/linux-postmarketos-qcom-msm8996: enable new community options (MR 3560)
    • c4fac0ad - community/linux-postmarketos-qcom-sm6350: enable new community options (MR 3560)

    Compare with previous version

    By Oliver Smith on 2022-11-01T15:47:53

  • Administrator enabled an automatic merge when the pipeline for c4fac0ad succeeds · Imported

    enabled an automatic merge when the pipeline for c4fac0ad succeeds

    By Oliver Smith on 2022-11-01T15:48:11

  • Administrator mentioned in issue #1785 (closed) · Imported

    mentioned in issue #1785 (closed)

    By Newbyte on 2022-11-14T09:25:34

  • Please register or sign in to reply
    Loading