Go to file
2021-10-27 19:23:46 -07:00
android ANDROID: GKI: rockchip: Enable symbol for rkcif 2021-10-19 08:55:27 +00:00
arch defconfig: Enable additional configs for NEO 2021-10-26 12:31:40 +05:30
block FROMGIT: blk-mq: Introduce the BLK_MQ_F_NO_SCHED_BY_DEFAULT flag 2021-08-05 12:21:53 -07:00
certs msm-kernel: add keygen to generate key-pair using openssl 2021-08-02 15:10:13 -07:00
crypto ANDROID: Enable GKI Dr. No Enforcement 2021-07-21 20:51:47 +01:00
Documentation Merge keystone/android12-5.10-keystone-qcom-release.43+ (a26c5a3) into msm-5.10 2021-09-09 22:13:14 -07:00
drivers Merge "remoteproc: q6v5: Set q6 state to offline on receiving wdog irq" 2021-10-27 12:59:23 -07:00
fs Merge keystone/android12-5.10-keystone-qcom-release.43+ (114a79f) into msm-5.10 2021-10-18 12:29:18 +05:30
include dt-bindings: regulator: rpmh-regulator: add and update voltage levels 2021-10-27 16:28:24 -07:00
init Merge keystone/android12-5.10-keystone-qcom-release.43+ (d8b574b) into msm-5.10 2021-06-27 21:46:07 -07:00
ipc ipc/mqueue, msg, sem: avoid relying on a stack reference past its expiry 2021-05-26 12:06:54 +02:00
kernel Merge keystone/android12-5.10-keystone-qcom-release.43+ (753f81e) into msm-5.10 2021-10-22 10:28:02 +05:30
lib Merge keystone/android12-5.10-keystone-qcom-release.43+ (dfb6b06) into msm-5.10 2021-07-07 23:26:19 -07:00
LICENSES LICENSES/deprecated: add Zlib license text 2020-09-16 14:33:49 +02:00
mm Merge keystone/android12-5.10-keystone-qcom-release.43+ (fe20a64) into msm-5.10 2021-10-05 16:31:23 +05:30
net Merge "net: vmw_vsock: gunyah: Add VMADDR_CID_ANY as supported cid" 2021-10-21 15:14:39 -07:00
samples samples: vfio-mdev: fix error handing in mdpy_fb_probe() 2021-06-10 13:39:15 +02:00
scripts ANDROID: sign-file: Fix warning when OPENSSL_NO_ENGINE is set 2021-10-19 08:56:16 -07:00
security ANDROID: selinux: modify RTM_GETNEIGH{TBL} 2021-06-23 14:06:26 +00:00
sound Merge keystone/android12-5.10-keystone-qcom-release.43+ (030acd3) into msm-5.10 2021-10-04 19:36:42 +05:30
techpack techpack: Replace xtype with type while searching for sub-dirs 2019-11-19 11:52:49 -08:00
tools ANDROID: Enable GKI Dr. No Enforcement 2021-07-21 20:51:47 +01: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 Revert "irqbypass: do not start cons/prod when failed connect" 2021-06-03 09:00:34 +02: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 Revert "ANDROID: Add build.config.msm.* to .gitignore" 2021-07-07 22:35:59 -07:00
.mailmap mailmap: add two more addresses of Uwe Kleine-König 2020-12-06 10:19:07 -08:00
Android.bp Android.bp: headers_install.sh: Use environment for unifdef tool 2021-02-18 09:36:58 -08:00
build.config.aarch64 ANDROID: arm64: enable compat vdso 2021-05-13 09:14:25 -07:00
build.config.allmodconfig ANDROID: allmodconfig: drop openssl from ADDITIONAL_HOST_TOOLS 2021-03-04 20:48:17 +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-12 10:08:04 +01:00
build.config.arm ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for arm 2021-03-24 09:21:58 -07:00
build.config.common build.config: Enable hermetic toolchain on msm-kernel 2021-10-19 09:00:06 -07:00
build.config.db845c ANDROID: db845c: Use FRAGMENT_CONFIG 2021-02-10 06:08:17 +00:00
build.config.gki ANDROID: gki: Removed cf modules from gki_defconfig 2020-02-01 00:27:50 +00:00
build.config.gki_consolidate.aarch64 ANDROID: qki: Add consolidate config 2021-05-05 19:49:45 -07:00
build.config.gki_kasan ANDROID: build.config: Disable LTO for KASAN and Kprobes builds 2021-03-08 00:31:49 +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_kprobes ANDROID: build.config: Disable LTO for KASAN and Kprobes builds 2021-03-08 00:31:49 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-03 02:03:02 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-03 02:03:02 +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: GKI: Add initial symbol list for i.MX 2021-08-19 11:11:52 +08:00
build.config.gki.aarch64.fips140 ANDROID: Fips 140: move fips symbols entirely in own list 2021-06-11 15:04:07 +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.hikey960 ANDROID: Add hikey960 build infrastructure file 2021-02-18 23:59:34 +00:00
build.config.khwasan ANDROID: Add a build config fragment for KHWASan. 2021-04-06 10:01:56 +00:00
build.config.msm.common Revert "build.config.msm.common: Allow silent removal of disabled symbols" 2021-06-25 14:54:32 -07:00
build.config.msm.gki build.config.msm.gki: Add other symbol lists 2021-10-07 11:36:14 -07:00
build.config.msm.lahaina build.config.msm.*: Add transition support to msm_kernel folder 2021-04-19 07:52:09 -07:00
build.config.msm.vm Merge "build.config: Enable hermetic toolchain on msm-kernel" 2021-10-27 19:23:46 -07:00
build.config.msm.waipio build.config.msm.waipio: Remove options to earlycon 2021-08-24 12:06:55 -07:00
build.config.msm.waipio.tuivm build.config: Enable hermetic toolchain on msm-kernel 2021-10-19 09:00:06 -07:00
build.config.neo build.config: Enable hermetic toolchain on msm-kernel 2021-10-19 09:00:06 -07:00
build.config.sxr.common build.config: Enable hermetic toolchain on msm-kernel 2021-10-19 09:00:06 -07:00
build.config.x86_64 ANDROID: build.config: Add vmlinux.symvers and modules.builtin to DIST_DIR 2021-04-15 10:24:17 +01:00
build.targets defconfig: Remove category identifier for Neo target 2021-06-14 17:44:59 +05:30
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 keystone/android12-5.10-keystone-qcom-release.43+ (fb8aecf) into msm-5.10 2021-08-19 00:43:01 -07:00
Kbuild kbuild: rename hostprogs-y/always to hostprogs/always-y 2020-02-04 01:53:07 +09:00
Kconfig sched/walt: Introduce WALT as a module 2021-01-20 14:18:55 -08:00
kernel_headers.py kernel_headers: Disable headers matching 2020-07-09 12:28:12 -07:00
MAINTAINERS Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
Makefile Merge "kbuild: Convert gcc-wrapper.py to C" 2021-06-18 18:28:47 -07:00
modules.list.msm.lahaina modules.list: Add mindump to module list 2021-02-26 07:48:01 -08:00
modules.list.msm.waipio Merge "drivers: dcvs: c1dcvs: aggregate enable for user and kernel" 2021-10-13 16:44:37 -07:00
modules.vendor_blocklist.msm.waipio modules.blocklist: Add mmrm test driver to block list 2021-03-30 08:40:44 -07:00
OWNERS ANDROID: Use authoritative Dr. No list from android-mainline 2021-07-22 15:25:25 +00:00
README
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)