Google GitGoogle Git
Sign in
android/kernel/common/8969ee93a483c1b007a1aa69cd1f1cf89cbce72f
commit
8969ee93a483c1b007a1aa69cd1f1cf89cbce72f
[log]
author
Greg Kroah-Hartman <gregkh@google.com>
Sat May 23 04:48:45 2026 +0000
committer
Greg Kroah-Hartman (xWF) <gregkh@google.com>
Fri May 22 23:48:05 2026 -0700
tree
2cc1980d5efea01d1863e827afcc49c8d684c168
parent
05eea940894a0a7e5c1f6e91dff5b64bdbe45b31 [diff]
parent
896d6c2efc7ff4e72bf6d5af14fb186da3bb99ad [diff]
Merge android13-5.15 into android13-5.15-lts

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

It contains the following commits:

* 896d6c2efc7f Merge tag 'android13-5.15.206_r00' into android13-5.15
* 35aa7a801190 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* eb191949a9b3 ANDROID: vendor_hooks: add hook when adding or deleting folios
* c54b05e676e2 ANDROID: gki_defconfig: Enable CONFIG_RTC_HCTOSYS for x86
* cf7832f4199b ANDROID: GKI: vivo add symbols to symbol list
* 677ffcf6287a ANDROID: vendor hooks: Add hooks for do_swap_page() wait folio lock issue
* da476b3009d2 UPSTREAM: xfrm: esp: ipv4: fix up flags setting
* aed0db89be29 FROMGIT: nfc: llcp: Fix use-after-free race in nfc_llcp_recv_cc()
* 6725d47a6b03 FROMGIT: nfc: llcp: Fix use-after-free in llcp_sock_release()
* 56dc7384428d ANDROID: GKI: update symbol list for vivo
* 25c40077f524 ANDROID: GKI: add fair task core selection logic vendor hooks.
* b7a5c1a12af5 UPSTREAM: xfrm: esp: avoid in-place decrypt on shared skb frags
* 274e5c5cb1c3 FROMGIT: can: bcm: prevent thrtimer UAF in rx path by checking RX_NO_AUTOTIMER
* 8e6e134ce7db ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 526e72883291 ANDROID: GKI: export symbols
* 610af57e7aa9 ANDROID: vendor_hooks: select workqueue based on task priority
* d7ffbe0aa289 ANDROID: vendor_hooks: add hook in alloc_and_link_pwqs()
* 2d2ad77eb3fe ANDROID: GKI: Update symbol list for vivo
* 8817f2e7b7a7 ANDROID: vendor_hooks: add hook in create_worker()
* 9a9b8017d147 ANDROID: 16K: Fix padding calculation during VMA split
* d93c0db2573f UPSTREAM: nfc: llcp: add missing return after LLCP_CLOSED checks
* f3cda89ca999 UPSTREAM: tipc: fix double-free in tipc_buf_append()
* f93739be5f99 ANDROID: ashmem: Handle ASHMEM_GET_FILE_ID from 32-bit userspace
* b5e25f772ad9 ANDROID: 16K: Allow VMAs with all padding pages.
* d82473129527 ANDROID: usb: gadget: f_accessory: prevent OOB write via HID reports
* 8bf252db2c08 ANDROID: fuse: Use vma_set_file() in fuse_backing_mmap()
* b1b609b1c10a FROMGIT: HID: logitech-dj: fix wrong detection of bad DJ_SHORT output report
* ea92adeab2db FROMGIT: HID: logitech-dj: Prevent REPORT_ID_DJ_SHORT related user initiated OOB write
* 50dfbd2821cd FROMGIT: HID: logitech-dj: Standardise hid_report_enum variable nomenclature
* 507b939649ed ANDROID: 16K: skip fault-around in ELF segment padding holes
* ec387b769956 ANDROID: 16K: improve robustness of vma padding logic
* fc88a7504f0f ANDROID: GKI: update symbol list for galaxy
* 6df71f315f50 ANDROID: kernel/fork: add vendor hook to trace mm_struct
* efbb8337a4a0 ANDROID: task_mmu: add vendor hook in task_mem
* d37a108f29b5 ANDROID: mm: export tracepoint symbol rss_stat
* f760592dfa07 FROMGIT: HID: logitech-hidpp: Prevent use-after-free on force feedback initialisation failure

Change-Id: I3066aa59f70e7783504a58dde8f5ceeed1ab8551
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 2cc1980d5efea01d1863e827afcc49c8d684c168
  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. samples/
  19. scripts/
  20. security/
  21. sound/
  22. tools/
  23. usr/
  24. virt/
  25. .clang-format
  26. .cocciconfig
  27. .get_maintainer.ignore
  28. .gitattributes
  29. .gitignore
  30. .mailmap
  31. BUILD.bazel
  32. build.config.aarch64
  33. build.config.allmodconfig
  34. build.config.allmodconfig.aarch64
  35. build.config.allmodconfig.arm
  36. build.config.allmodconfig.x86_64
  37. build.config.amlogic
  38. build.config.arm
  39. build.config.common
  40. build.config.constants
  41. build.config.db845c
  42. build.config.gce.x86_64
  43. build.config.gki
  44. build.config.gki-debug.aarch64
  45. build.config.gki-debug.x86_64
  46. build.config.gki.aarch64
  47. build.config.gki.aarch64.fips140
  48. build.config.gki.x86_64
  49. build.config.gki_kasan
  50. build.config.gki_kasan.aarch64
  51. build.config.gki_kasan.x86_64
  52. build.config.gki_kprobes
  53. build.config.gki_kprobes.aarch64
  54. build.config.gki_kprobes.x86_64
  55. build.config.khwasan
  56. build.config.rockpi4
  57. build.config.x86_64
  58. COPYING
  59. CREDITS
  60. Kbuild
  61. Kconfig
  62. Kconfig.ext
  63. MAINTAINERS
  64. Makefile
  65. OWNERS
  66. README
  67. 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 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)