Kernel for Galaxy S24, rebased on CLO sources (WIP)
Go to file
John Moon 515dc189be build: Unify output directory format
Currently, the Bazel build output directory format differs from
legacy build.sh in that it replaces underscores directory name to
hyphens.

This behavior is undesirable, so refactor the output directory name
logic to be consistent with legacy build.sh:

out/msm-kernel-<target>-<variant> where words in the target and
variant are underscore-delimited.

Change-Id: Ia60076dd613fc034888703f10d5dc836b34c317b
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
2023-01-18 17:14:58 -08:00
android abi_gki_aarch64_qcom: Updating symbol list with Kleaf 2023-01-10 13:59:55 -08:00
arch Merge "arm64: defconfig: Enable minidump feature on pineapple SoC" 2023-01-10 07:36:39 -08:00
block Linux 6.1-rc7 2022-11-28 16:47:55 +00:00
certs Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
crypto Merge f1947d7c8a ("Merge tag 'random-6.1-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random") into android-mainline 2022-10-25 15:59:10 +02:00
Documentation Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
drivers Merge "virt: gunyah: rsc_mgr: Allocate right buffer size of requests" 2023-01-12 21:41:32 -08:00
fs Merge 479174d402 ("Merge tag 'platform-drivers-x86-v6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline 2022-12-08 16:31:31 +00:00
include Merge "mem-buf: Fix compilation error when QCOM_MEM_BUF=n" 2023-01-09 17:07:07 -08:00
init Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
io_uring io_uring: Fix a null-ptr-deref in io_tctx_exit_cb() 2022-12-07 06:45:20 -07:00
ipc ipc/sem: Fix dangling sem_array access in semtimedop race 2022-12-05 10:54:44 -08:00
kernel sched/walt: Prevent cpu rejection if only unhalted cpus are online 2023-01-13 09:17:59 -08:00
lib Merge keystone/mirror-android-mainline into keystone/android-mainline-keystone-qcom-dev 2022-12-07 23:11:47 -08:00
LICENSES LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers 2021-12-16 14:33:10 +01:00
mm Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
net Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
rust Kbuild: add Rust support 2022-09-28 09:02:20 +02:00
samples VFIO updates for v6.1-rc1 2022-10-12 14:46:48 -07:00
scripts scripts: add -Wno-format KBUILD_CFLAGS for clang 16 2023-01-02 18:07:11 -08:00
security Merge 8f71a2b3f4 ("Merge tag 'docs-6.1-fixes' of git://git.lwn.net/linux") into android-mainline 2022-11-02 08:43:07 +01:00
sound Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
tools Linux 6.1 2022-12-12 09:10:35 +01:00
usr usr/gen_init_cpio.c: remove unnecessary -1 values from int file 2022-10-03 14:21:44 -07:00
virt Merge branch 'kvm-dwmw2-fixes' into HEAD 2022-11-23 18:59:45 -05:00
.clang-format inet: ping: use hlist_nulls rcu iterator during lookup 2022-12-01 12:42:46 +01:00
.cocciconfig
.get_maintainer.ignore get_maintainer: add Alan to .get_maintainer.ignore 2022-08-20 15:17:44 -07:00
.gitattributes .gitattributes: use 'dts' diff driver for dts files 2019-12-04 19:44:11 -08:00
.gitignore Merge keystone/android-mainline-keystone-qcom-release.6.1-rc5 (e9630af) into msm-pineapple 2022-12-10 23:51:29 -08:00
.mailmap 9 hotfixes. 6 for MM, 3 for other areas. Four of these patches address 2022-12-10 17:10:52 -08:00
.rustfmt.toml rust: add .rustfmt.toml 2022-09-28 09:02:20 +02:00
Android.bp kernel: Create and export kernel headers 2022-05-31 18:19:41 -07:00
bazel.WORKSPACE build: Add custom bazel.WORKSPACE file 2022-10-19 16:52:01 -07:00
build_with_bazel.py ANDROID: build: Clean up legacy generated files 2023-01-11 11:51:28 -08:00
BUILD.bazel ANDROID: bazel: Update GKI module list 2023-01-10 09:45:35 -08:00
build.config.aarch64 ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
build.config.allmodconfig ANDROID: allmodconfig: Disable RANDSTRUCT 2022-12-01 10:37:28 +00:00
build.config.allmodconfig.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.arm ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.amlogic ANDROID: GKI: amlogic: add DTB overlays 2021-02-11 12:23:26 +00:00
build.config.arm ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
build.config.common ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__ 2022-04-29 17:50:28 +00:00
build.config.constants ANDROID: clang: update to 16.0.1 2022-12-08 18:43:55 +00:00
build.config.db845c ANDROID: Convert db845c to a mixed build. 2022-09-06 23:21:51 +00:00
build.config.gki ANDROID: GKI: Add support for a GKI_BUILD_CONFIG_FRAGMENT 2021-06-24 00:26:54 +00:00
build.config.gki_consolidate.aarch64 ANDROID: bazel: add GKI consolidate Bazel build 2022-10-26 23:26:28 -07:00
build.config.gki_kasan ANDROID: build.config: re-disable LTO properly for KASAN 2022-03-24 12:41:35 -07:00
build.config.gki_kasan.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kasan.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kprobes ANDROID: build.configs: migrate away from CC_LD_ARG 2021-07-02 09:49:23 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki-debug.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki-debug.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki.aarch64 ANDROID: Adding Image.gz and boot-gz.img 2022-06-13 10:00:31 +00:00
build.config.gki.aarch64.16k ANDROID: 16k target: don't write defconfig to source tree 2022-10-03 11:24:35 -07:00
build.config.gki.riscv64 ANDROID: GKI: Add 64-bit RISC-V config 2022-12-08 20:01:15 +00:00
build.config.gki.x86_64 ANDROID: Enable BUILD_GKI_CERTIFICATION_TOOLS for x86_64 GKI 2022-09-22 13:17:50 +00:00
build.config.khwasan ANDROID: Add a build config fragment for KHWASan. 2021-10-13 19:44:44 +00:00
build.config.msm.common build.config.msm.common: give warning if vendor_dlkm.modules.load is empty file 2023-01-03 16:32:53 -08:00
build.config.msm.gki build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.kalama build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.kalama.oemvm config: Add build config for kkp oemvm 2022-09-05 19:51:04 -07:00
build.config.msm.kalama.tuivm config: Add build config and defconfig for kkp 2022-09-08 02:20:39 -07:00
build.config.msm.kalama.vm config: Add build config and defconfig for kkp 2022-09-08 02:20:39 -07:00
build.config.msm.pineapple build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.pineapple.oemvm build: config: Adding build configs for pineapple oemvm 2022-09-05 18:20:59 -07:00
build.config.msm.pineapple.tuivm build: config: Adding build configs for vm and pineapple tuivm 2022-08-11 01:46:21 -07:00
build.config.msm.pineapple.vm build.config.msm.pineapple.vm: Introduce PREFERRED_USERSPACE 2022-08-18 01:10:19 -07:00
build.config.msm.vm build: config: Adding build configs for vm and pineapple tuivm 2022-08-11 01:46:21 -07:00
build.config.riscv64 ANDROID: GKI: Add 64-bit RISC-V config 2022-12-08 20:01:15 +00:00
build.config.rockpi4 ANDROID: rockpi4: Use new DTS_EXT_DIR feature 2021-12-13 21:27:46 +00:00
build.config.x86_64 ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
BUILD.dtc ANDROID: Fix libfdt dependency 2022-12-01 11:05:16 -08:00
build.targets build.targets: Add pineapple and kkp vm to build target 2022-09-12 07:41:05 -07:00
consolidate.bzl ANDROID: bazel: Updatate consolidate GKI module list 2022-12-19 16:09:48 -08:00
COPYING COPYING: state that all contributions really are covered by this file 2020-02-10 13:32:20 -08:00
CREDITS MAINTAINERS: Remove Michal Marek from Kbuild maintainers 2022-11-16 14:53:00 +09:00
files_gki_aarch64.txt Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
image_opts.bzl build: Add support for Bazel VM builds 2022-11-14 15:05:22 -08:00
kalama_oemvm.bzl ANDROID: Enable oemvm builds in Bazel 2022-12-19 09:40:20 -08:00
kalama_tuivm.bzl build: Add support for Bazel VM builds 2022-11-14 15:05:22 -08:00
kalama.bzl ANDROID: bazel: Update GKI module list 2023-01-10 09:45:35 -08:00
Kbuild Kbuild updates for v6.1 2022-10-10 12:00:45 -07:00
Kconfig sched/walt: Introduce WALT as a module 2022-06-28 18:45:55 -07:00
Kconfig.ext ANDROID: kbuild: add Kconfig support for external modules 2021-12-13 18:33:18 +00:00
MAINTAINERS Linux 6.1 2022-12-12 09:10:35 +01:00
Makefile Merge keystone/android-mainline-keystone-qcom-release.6.1 (3803dec) into msm-pineapple 2022-12-22 23:43:13 -08:00
modules.bzl ANDROID: GKI: Fix linter warning 2022-12-01 13:06:20 +00:00
modules.list.msm.kalama modules.list.msm.pineapple: Add interconnect common module 2022-09-30 02:03:44 -07:00
modules.list.msm.pineapple arm64: defconfig: Enable minidump feature on pineapple SoC 2023-01-04 15:27:25 -08:00
modules.systemdlkm_blocklist.msm.kalama build: Add systemdlkm blocklist for kalama 2023-01-05 14:49:36 -08:00
modules.systemdlkm_blocklist.msm.pineapple build.config.msm.pineapple: Enable system_dlkm partition 2022-10-17 15:16:36 -07:00
modules.vendor_blocklist.msm.kalama treewide: fix copyrights 2023-01-06 13:10:31 -08:00
modules.vendor_blocklist.msm.pineapple treewide: fix copyrights 2023-01-06 13:10:31 -08:00
msm_abl.bzl build: Unify output directory format 2023-01-18 17:14:58 -08:00
msm_common.bzl build: Unify output directory format 2023-01-18 17:14:58 -08:00
msm_dtc.bzl build: Unify output directory format 2023-01-18 17:14:58 -08:00
msm_kernel_extensions.bzl build: Add top-level rule definition in bazel extensions 2022-11-14 15:06:47 -08:00
msm_kernel_la.bzl build: Unify output directory format 2023-01-18 17:14:58 -08:00
msm_kernel_vm.bzl build: Unify output directory format 2023-01-18 17:14:58 -08:00
msm_platforms.bzl ANDROID: Enable oemvm builds in Bazel 2022-12-19 09:40:20 -08:00
OWNERS ANDROID: add smuckle to OWNERS 2022-06-18 10:41:40 -07:00
OWNERS_DrNo ANDROID: Updating OWNERS_DrNo 2022-08-22 16:34:52 +00:00
pineapple_oemvm.bzl ANDROID: Enable oemvm builds in Bazel 2022-12-19 09:40:20 -08:00
pineapple_tuivm.bzl build: Add support for Bazel VM builds 2022-11-14 15:05:22 -08:00
pineapple.bzl Merge "ANDROID: Update pineapple module list" 2023-01-12 10:03:09 -08:00
README Drop all 00-INDEX files from Documentation/ 2018-09-09 15:08:58 -06:00
README.md ANDROID: README.md: fix checkpatch.pl path typo 2021-04-07 23:16:50 +00:00
super_image.bzl ANDROID: enable pineapple kleaf build 2022-10-31 11:09:02 -07:00
target_variants.bzl ANDROID: Enable oemvm builds in Bazel 2022-12-19 09:40:20 -08:00
uapi_library.bzl build: Export UAPI headers as Bazel cc_library 2022-11-14 16:02:01 -08:00
uapi_unpacker.bzl build: Export UAPI headers as Bazel cc_library 2022-11-14 16:02:01 -08:00

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.
  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass scripts/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)