Google Git
Sign in
android/kernel/common/0d918fa8e88d750d62041e720012efb22d89728e
commit
0d918fa8e88d750d62041e720012efb22d89728e
[log]
author
Greg Kroah-Hartman <gregkh@google.com>
Wed Jun 25 09:41:54 2025 +0000
committer
Greg Kroah-Hartman <gregkh@google.com>
Wed Jun 25 09:41:56 2025 +0000
tree
dc4ab6b85cbe3857b534a0d07ff7395450567081
parent
e678c93d43cc59dbad86bb0ad0ff6a7ed675a154 [diff]
parent
25a456b541bbd2d159a29c5978b6ed288999429c [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:

* 25a456b541bb Merge tag 'android13-5.15.185_r00' into android13-5.15
* 2ed6a4c61dbd ANDROID: vendor_hooks: add symbols for lazy preemption
* 8b8ff9ae59a4 ANDROID: vendor_hooks: add one hook for lazy preemption
* fcf6bc550c43 ANDROID: GKI: Update symbol list for MTK
* 28215ba4fe16 FROMGIT: f2fs: sysfs: export linear_lookup in features directory
* 401f0dabbc89 FROMGIT: f2fs: sysfs: add encoding_flags entry
* 1bda8e1c35f5 FROMGIT: f2fs: support to disable linear lookup fallback
* 06f12cdca158 ANDROID: GKI: Update symbol list for Amlogic
* 09ad63d69017 Revert "ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode"
* aff31aefc98d BACKPORT: binder: Create safe versions of binder log files
* 1a2bb9facfcb UPSTREAM: binder: Refactor binder_node print synchronization
* 704c8566b776 ANDROID: GKI: Add symbols to symbol list for oppo
* 1789a7234e8e ANDROID: mm: add vendor hook to activate/unactivate folios
* 2f9eb8ebfbd2 ANDROID: GKI: Update oplus symbol list
* deef1c2ff269 ANDROID: mm: add vendor hooks for file folio reclaim.
* b61cb9438bbd ANDROID: vendor_hooks: mm: Add tune_swappiness vendor hook in get_swappiness()
* 8c5af78b1528 ANDROID: mm: add vendor hooks to adjust memory reclamation
* 8215ab685873 ANDROID: mm: Add vendor hook in pagecache_get_page()
* a62ad076f8d9 ANDROID: vendor_hooks: add hooks for extra memory
* 54677afc8eb1 ANDROID: mm: export isolate_folio and reclaim_pages
* f4357ac53bff UPSTREAM: usb: gadget: f_midi: Fixing wMaxPacketSize exceeded issue during MIDI bind retries
* dc5cf21ceef3 UPSTREAM: scsi: ufs: core: Fix the HIGH/LOW_TEMP Bit Definitions
* bc881bfc7531 UPSTREAM: crypto: api - Fix boot-up self-test race
* 78433898e1d4 UPSTREAM: wifi: nl80211: fix NL80211_ATTR_MLO_LINK_ID off-by-one
* b3af89c2f912 UPSTREAM: f2fs: compress: fix error path of inc_valid_block_count()
* 8d89d89925a2 BACKPORT: f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode
* 0c258fac84c5 BACKPORT: mm/memcg: use kmem_cache when alloc memcg pernode info
* 1c9f4af5cbe4 BACKPORT: mm/memcg: use kmem_cache when alloc memcg
* f31787a3bea2 UPSTREAM: mm/memcg: move mem_cgroup_init() ahead of cgroup_init()
* 8eda83c75ad5 ANDROID: GKI: Update symbol list for Amlogic
* 2b7d7bb68588 ANDROID: GKI: Add symbols to symbol list for oppo

Change-Id: I8834459cba7c8b885ececd1c914055359c616793
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: dc4ab6b85cbe3857b534a0d07ff7395450567081
  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)