Go to file
Elliot Berman f554bcdf54 build.config: Always generate boot image with uncompressed kernel
For msm targets, always generate boot.img with uncompressed Image.

Change-Id: I06c7594f3880f8bbee77dda8747a6975fa5bdb1f
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-12-18 10:48:33 -08:00
android Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
arch Merge "modules.list.msm.waipio: add qcom-spmi-adc5 and qti-adc-tm modules" 2020-12-17 20:27:09 -08:00
block Restore upstream files 2020-12-15 19:36:32 -08:00
certs .gitignore: add SPDX License Identifier 2020-03-25 11:50:48 +01:00
crypto drivers-5.10-2020-10-12 2020-10-13 13:04:41 -07:00
Documentation Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
drivers Merge "soc: qcom: Initialize virtio device related resources" 2020-12-18 00:46:04 -08:00
fs Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
include Merge "soc: qcom: Initialize virtio device related resources" 2020-12-18 00:46:04 -08:00
init Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
ipc ipc: adjust proc_ipc_sem_dointvec definition to match prototype 2020-09-05 12:14:29 -07:00
kernel Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
lib Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
LICENSES LICENSES/deprecated: add Zlib license text 2020-09-16 14:33:49 +02:00
mm Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
net Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
samples Tracing fixes for 5.10-rc6 2020-12-01 15:30:18 -08:00
scripts Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
security Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
sound Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
techpack techpack: Replace xtype with type while searching for sub-dirs 2019-11-19 11:52:49 -08:00
tools FROMLIST: objtool: Split noinstr validation from --vmlinux 2020-12-16 08:56:36 -08:00
usr Merge branch 'work.fdpic' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2020-08-07 13:29:39 -07:00
virt kvm: x86/mmu: Support dirty logging for the TDP MMU 2020-10-23 03:42:13 -04:00
.clang-format RDMA 5.10 pull request 2020-10-17 11:18:18 -07:00
.cocciconfig
.get_maintainer.ignore Opt out of scripts/get_maintainer.pl 2019-05-16 10:53:40 -07:00
.gitattributes .gitattributes: use 'dts' diff driver for dts files 2019-12-04 19:44:11 -08:00
.gitignore Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
.mailmap mailmap: add two more addresses of Uwe Kleine-König 2020-12-06 10:19:07 -08:00
Android.bp Example kernel headers header_lib package 2020-01-18 13:31:06 -08:00
build.config.aarch64 ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for aarch64 2020-11-10 12:14:17 -08:00
build.config.allmodconfig ANDROID: Disable dynamic ftrace for allmodconfig builds 2020-12-16 08:56:36 -08: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.arm ANDROID: ARM: Use zImage instead of Image 2020-11-13 15:56:44 +00:00
build.config.common Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
build.config.db845c ANDROID: add initial symbol list for db845c 2020-12-16 11:36:20 +00:00
build.config.gki ANDROID: gki: Removed cf modules from gki_defconfig 2020-02-01 00:27:50 +00:00
build.config.gki_kasan ANDROID: Rename build.config.gki.arch_kasan 2020-05-05 20:50:47 +00: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-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: add initial symbol list for cuttlefish 2020-12-16 11:36:20 +00:00
build.config.gki.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.msm.common build.config: Always generate boot image with uncompressed kernel 2020-12-18 10:48:33 -08:00
build.config.msm.gki Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
build.config.msm.lahaina build.config: Add support for KERNEL_CMDLINE_CONSOLE_AUTO 2020-11-13 10:50:58 -08:00
build.config.msm.vm build.config: add new build configs to compile vm 2020-12-10 11:08:49 -08:00
build.config.msm.waipio build.config.msm.waipio: Enable vendor_dlkm partition 2020-12-15 20:27:51 -08:00
build.config.msm.waipio.tuivm build.config: add new build configs to compile vm 2020-12-10 11:08:49 -08:00
build.config.x86_64 ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for x86_64 2020-11-13 11:49:39 -08:00
build.targets build.targets: Add build.config.msm.vm 2020-12-10 12:20:52 -08:00
COPYING COPYING: state that all contributions really are covered by this file 2020-02-10 13:32:20 -08:00
CREDITS MAINTAINERS: Move Jason Cooper to CREDITS 2020-11-30 10:20:34 +01:00
files_gki_aarch64.txt Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
gen_headers_arm64.bp Merge msm-5.4 (158801d) into msm-5.10 2020-12-14 10:24:26 -08:00
gen_headers_arm.bp Merge msm-5.4 (158801d) into msm-5.10 2020-12-14 10:24:26 -08:00
Kbuild kbuild: rename hostprogs-y/always to hostprogs/always-y 2020-02-04 01:53:07 +09:00
Kconfig kbuild: ensure full rebuild when the compiler is updated 2020-05-12 13:28:33 +09:00
kernel_headers.py kernel_headers: Disable headers matching 2020-07-09 12:28:12 -07:00
MAINTAINERS Merge 33dc9614dc ("Merge tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest") into android-mainline 2020-12-11 10:26:31 +01:00
Makefile Merge android12-5.10.1+ (ec1fff1) into msm-5.10 2020-12-17 12:15:41 -08:00
modules.list.msm.lahaina module: Add ipc logging driver to modules list 2020-12-02 16:06:56 -08:00
modules.list.msm.waipio Merge "modules.list.msm.waipio: add qcom-spmi-adc5 and qti-adc-tm modules" 2020-12-17 20:27:09 -08:00
README Drop all 00-INDEX files from Documentation/ 2018-09-09 15:08:58 -06:00
README.md ANDROID: README: Add requirement for "Bug:" tag for FROMLIST 2020-05-01 15:36:12 -07: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 script/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)