d82a67cbef
* refs/heads/tmp-8cf9478:
Revert "ANDROID: GKI: Enable bounds sanitizer"
ANDROID: GKI: temporarily disable LTO/CFI
ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()"
FROMLIST: KVM: arm64: Disable FWB in host stage-2
FROMLIST: KVM: arm64: Introduce KVM_PGTABLE_S2_NOFWB Stage-2 flag
FROMLIST: KVM: arm64: Protect the .hyp sections from the host
FROMLIST: KVM: arm64: Disable PMU support in protected mode
FROMLIST: KVM: arm64: Page-align the .hyp sections
FROMLIST: KVM: arm64: Wrap the host with a stage 2
FROMLIST: KVM: arm64: Provide sanitized mmfr* registers at EL2
FROMLIST: KVM: arm64: Add kvm_pgtable_stage2_find_range()
FROMLIST: KVM: arm64: Refactor the *_map_set_prot_attr() helpers
FROMLIST: KVM: arm64: Use page-table to track page ownership
FROMLIST: KVM: arm64: Always zero invalid PTEs
FROMLIST: KVM: arm64: Sort the hypervisor memblocks
FROMLIST: KVM: arm64: Reserve memory for host stage 2
FROMLIST: KVM: arm64: Make memcache anonymous in pgtable allocator
FROMLIST: KVM: arm64: Refactor __populate_fault_info()
FROMLIST: KVM: arm64: Refactor __load_guest_stage2()
FROMLIST: KVM: arm64: Refactor kvm_arm_setup_stage2()
FROMLIST: KVM: arm64: Set host stage 2 using kvm_nvhe_init_params
FROMLIST: KVM: arm64: Use kvm_arch in kvm_s2_mmu
FROMLIST: KVM: arm64: Use kvm_arch for stage 2 pgtable
FROMLIST: KVM: arm64: Elevate hypervisor mappings creation at EL2
FROMLIST: KVM: arm64: Prepare the creation of s1 mappings at EL2
FROMLIST: arm64: asm: Provide set_sctlr_el2 macro
FROMLIST: KVM: arm64: Factor out vector address calculation
FROMLIST: KVM: arm64: Provide __flush_dcache_area at EL2
FROMLIST: KVM: arm64: Enable access to sanitized CPU features at EL2
FROMLIST: KVM: arm64: Introduce a Hyp buddy page allocator
FROMLIST: KVM: arm64: Stub CONFIG_DEBUG_LIST at Hyp
FROMLIST: KVM: arm64: Introduce an early Hyp page allocator
FROMLIST: KVM: arm64: Allow using kvm_nvhe_sym() in hyp code
FROMLIST: KVM: arm64: Make kvm_call_hyp() a function call at Hyp
FROMLIST: KVM: arm64: Introduce a BSS section for use at Hyp
FROMLIST: KVM: arm64: Factor memory allocation out of pgtable.c
FROMLIST: KVM: arm64: Avoid free_page() in page-table allocator
FROMLIST: KVM: arm64: Initialize kvm_nvhe_init_params early
FROMLIST: arm64: kvm: Add standalone ticket spinlock implementation for use at hyp
FROMLIST: KVM: arm64: Link position-independent string routines into .hyp.text
FROMLIST: arm64: lib: Annotate {clear, copy}_page() as position-independent
Revert "ANDROID: sched: cpufreq_schedutil: add sugov tracepoints"
ANDROID: Partial revert of
|
||
|---|---|---|
| android | ||
| arch | ||
| block | ||
| certs | ||
| crypto | ||
| Documentation | ||
| drivers | ||
| fs | ||
| include | ||
| init | ||
| ipc | ||
| kernel | ||
| lib | ||
| LICENSES | ||
| mm | ||
| net | ||
| samples | ||
| scripts | ||
| security | ||
| sound | ||
| techpack | ||
| tools | ||
| usr | ||
| virt | ||
| .clang-format | ||
| .cocciconfig | ||
| .get_maintainer.ignore | ||
| .gitattributes | ||
| .gitignore | ||
| .mailmap | ||
| Android.bp | ||
| build.config.aarch64 | ||
| build.config.allmodconfig | ||
| build.config.allmodconfig.aarch64 | ||
| build.config.allmodconfig.arm | ||
| build.config.allmodconfig.x86_64 | ||
| build.config.amlogic | ||
| build.config.arm | ||
| build.config.common | ||
| build.config.db845c | ||
| build.config.gki | ||
| build.config.gki_kasan | ||
| build.config.gki_kasan.aarch64 | ||
| build.config.gki_kasan.x86_64 | ||
| build.config.gki_kprobes | ||
| build.config.gki_kprobes.aarch64 | ||
| build.config.gki_kprobes.x86_64 | ||
| build.config.gki-debug.aarch64 | ||
| build.config.gki-debug.x86_64 | ||
| build.config.gki.aarch64 | ||
| build.config.gki.x86_64 | ||
| build.config.hikey960 | ||
| build.config.msm.common | ||
| build.config.msm.gki | ||
| build.config.msm.lahaina | ||
| build.config.msm.vm | ||
| build.config.msm.waipio | ||
| build.config.msm.waipio.tuivm | ||
| build.config.x86_64 | ||
| build.targets | ||
| COPYING | ||
| CREDITS | ||
| files_gki_aarch64.txt | ||
| Kbuild | ||
| Kconfig | ||
| kernel_headers.py | ||
| MAINTAINERS | ||
| Makefile | ||
| modules.list.msm.lahaina | ||
| modules.list.msm.waipio | ||
| modules.vendor_blocklist.msm.waipio | ||
| README | ||
| README.md | ||
How do I submit patches to Android Common Kernels
-
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.
- Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux,
additions of
-
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:, orANDROID:. - 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
- tag the patch subject with
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 ofUPSTREAM:.- use the same tags as
UPSTREAM: - add comments about the changes under the
(cherry picked from commit ...)line - Example:
- use the same tags as
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 uselinux-nextfor example). - if changes were required, use
BACKPORT: FROMGIT: - Example:
- if the commit message in the maintainer tree is
- tag the patch subject with
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:
- tag the patch subject with
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:
- tag the patch subject with
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)
- tag the patch subject with