Google Git
Sign in
android/kernel/common.git/refs/heads/android15-6.6-lts
commit
2cf70ce58ed3b5ccd217b08a190a89ca905a7d27
[log] [tgz]
author
Greg Kroah-Hartman <gregkh@google.com>
Sat Mar 21 07:30:43 2026 +0000
committer
Greg Kroah-Hartman <gregkh@google.com>
Sat Mar 21 07:30:45 2026 +0000
tree
8de879e48eecffc793f6920d8d06650346922d50
parent
48ab0e7494e331db0c066e20fa26f3b676a78eee [diff]
parent
adaba3e91947a078e89f9990010e3adc2aafce7b [diff]
Merge android15-6.6 into android15-6.6-lts

This merges the android15-6.6 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* adaba3e91947 Merge tag 'android15-6.6.127_r00' into android15-6.6
* 40ae02a7c7f8 ANDROID: GKI: update xiaomi symbol list
* 5e24c3cf6b25 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 3f5e399f0690 ANDROID: mm: Add vendor hook in filemap_map_order0_folio()
* e8ef6f9ae94b ANDROID: ABI: Update pixel symbol list
* a30db43e05df ANDROID: sched: Add vendor hook for task_fits_cpu
* 9129a20e2343 ANDROID: GKI: Update symbol list for Pixel Watch
* 7363accb86b4 ANDROID: kleaf: fix build issue with the CI
* 4cfe25edb52b ANDROID: GKI: update symbol list for xiaomi
* d6df6238a3a9 ANDROID: mm/readahead: add for bypass high order allocation
* 820971d81189 ANDROID: Remove thp_underused_split_page from vmstat_text
* 210f928df1ee Revert "ANDROID: mm/memfd-ashmem-shim: Introduce shim layer"
* 411c8147d814 Revert "ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler"
* e98901004e2a Revert "ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM"
* 27141d1ee007 ANDROID: add symbols needed for the wonder DDK module
* 36d603072907 ANDROID: Add support for building the wonder driver for ARM64
* c0f2ff4b4f25 ANDROID: 16K: Fix double entry in [s]maps for all-pad VMAs
* a5d39a82956d Revert "ANDROID: GKI: enable CONFIG_TLS=m as a GKI module"
* 80d121daf99d ANDROID: GKI: update symbol list for galaxy
* 1d44c04ba860 ANDROID: mm: add vendor hook in free_unref_folios and free_unref_page
* a89333fc16bb ANDROID: kernel/fork: add vendor hook to trace mm_struct
* d81b8b09b17d ANDROID: task_mmu: add vendor hook in task_mem
* dbefedf4cb9d ANDROID: mm: export tracepoint symbol rss_stat
* 4a373d05c4fc ANDROID: GKI: Add initial dynamically task vendor size flow
* e4f7662aea6a ANDROID: GKI: Guard dynamic task_struct size feature with config option
* a43d5451ea75 ANDROID: GKI: Put vendor_data_pad behind CONFIG_GKI_DYNAMIC_TASK_STRUCT_SIZE
* 24886b585520 ANDROID: GKI: Add to task_struct size via cmdline
* 29aa7dd50eb5 ANDROID: GKI: Add padding after init_task structure
* 9718459e2c57 ANDROID: GKI: Enable the option to alter task_struct size dynamically
* 4604201b8d0a ANDROID: GKI: update symbol list for xiaomi
* e21f359e72ac ANDROID: mm: add vendor hook to trace swap bio charge
* 39d310b0a4c1 ANDROID: GKI: update symbol list for xiaomi
* 9983e7a1b48a ANDROID: fs: add vendor hook to trace put_super
* 26f496287199 ANDROID: mm: add vendor hook to trace folio allocation and reclamation

Change-Id: If239c8e44c96eacee6c3aae2ac635b69cb4d4619
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 8de879e48eecffc793f6920d8d06650346922d50
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. io_uring/
  12. ipc/
  13. kernel/
  14. lib/
  15. LICENSES/
  16. mm/
  17. net/
  18. rust/
  19. samples/
  20. scripts/
  21. security/
  22. sound/
  23. tools/
  24. usr/
  25. virt/
  26. .clang-format
  27. .cocciconfig
  28. .get_maintainer.ignore
  29. .gitattributes
  30. .gitignore
  31. .mailmap
  32. .rustfmt.toml
  33. abi.bzl
  34. BUILD.bazel
  35. build.config.aarch64
  36. build.config.allmodconfig
  37. build.config.allmodconfig.aarch64
  38. build.config.allmodconfig.arm
  39. build.config.allmodconfig.x86_64
  40. build.config.amlogic
  41. build.config.arm
  42. build.config.common
  43. build.config.constants
  44. build.config.crashdump
  45. build.config.crashdump.aarch64
  46. build.config.crashdump.x86_64
  47. build.config.db845c
  48. build.config.gki
  49. build.config.gki.aarch64
  50. build.config.gki.aarch64.fips140
  51. build.config.gki.x86_64
  52. build.config.gki_kasan
  53. build.config.gki_kasan.aarch64
  54. build.config.gki_kasan.x86_64
  55. build.config.gki_kprobes
  56. build.config.gki_kprobes.aarch64
  57. build.config.gki_kprobes.x86_64
  58. build.config.khwasan
  59. build.config.kunit.aarch64
  60. build.config.kunit.x86_64
  61. build.config.microdroid
  62. build.config.microdroid.aarch64
  63. build.config.microdroid.x86_64
  64. build.config.rockpi4
  65. build.config.wonder
  66. build.config.x86_64
  67. COPYING
  68. CREDITS
  69. Kbuild
  70. Kconfig
  71. Kconfig.ext
  72. MAINTAINERS
  73. Makefile
  74. modules.bzl
  75. OWNERS
  76. README
  77. README.md
README.md

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 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>
  • If a patch has been submitted to the community, but rejected, do NOT use the FROMLIST: tag to try to hide this fact. Use the ANDROID: tag as described below as this must be considered as an Android-specific submission, not an upstream submission as the community will not accept these changes as-is.

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)