Google Git
Sign in
android / kernel / common / refs/heads/android14-5.15-lts
commitd0c0d12b92785775c40c9e896b71ce8c698fcbf2[log] [tgz]
authorGreg Kroah-Hartman <[email protected]>Sun Jan 26 16:52:07 2025 +0000
committerGreg Kroah-Hartman <[email protected]>Sun Jan 26 16:52:47 2025 +0000
tree8fce3da60482f4cf2ec685093adc4512d4acba4b
parent520b332275d86e278ea850dbd000161622711ff4 [diff]
parent49bd830ea5e30f59495e703aae18331882b76760 [diff]
Merge branch 'android14-5.15' into android14-5.15-lts

This catches the -lts branch up with the non-lts branch.  Changes
included in here are the following:

* 49bd830ea5e3 Merge tag 'android14-5.15.176_r00' into android14-5.15
* a8d5bc2be81e ANDROID: KVM: arm64: Fix corrupted PSTATE during guest debug
* 40a829e00cd3 BACKPORT: iommu: Avoid more races around device probe
* 21a8754aa332 UPSTREAM: cgroup: remove cgroup_rstat_flush_atomic()
* d55eb20d01e6 UPSTREAM: memcg: remove mem_cgroup_flush_stats_atomic()
* ddf579f6df83 UPSTREAM: memcg: calculate root usage from global state
* 3d87f091cde6 UPSTREAM: memcg: flush stats non-atomically in mem_cgroup_wb_stats()
* 57aae141f7f1 UPSTREAM: writeback: move wb_over_bg_thresh() call outside lock section
* 7bab64cba7b6 UPSTREAM: memcg: do not modify rstat tree for zero updates
* 64e22f884450 UPSTREAM: vmscan: memcg: sleep when flushing stats during reclaim
* f1c51f360eaf UPSTREAM: workingset: memcg: sleep when flushing stats in workingset_refault()
* bfd8db0bbcc5 UPSTREAM: memcg: sleep during flushing stats in safe contexts
* 6dbaf06af0c4 UPSTREAM: memcg: replace stats_flush_lock with an atomic
* 74cfecb700b7 UPSTREAM: memcg: do not flush stats in irq context
* 3f574511a9fb UPSTREAM: memcg: rename mem_cgroup_flush_stats_"delayed" to "ratelimited"
* d91f9f41b272 UPSTREAM: cgroup: rename cgroup_rstat_flush_"irqsafe" to "atomic"
* 95ba48003cff ANDROID: f2fs: fix wrong backport solution
* ce4d61129962 ANDROID: f2fs: fix wrong merge solution
* a15ea19d1a4f UPSTREAM: selinux: ignore unknown extended permissions
* c0bad795ed1a UPSTREAM: bpf: sync_linked_regs() must preserve subreg_def
* f68a69f66ca4 UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug
* cb9417c48e67 BACKPORT: f2fs: fix to account dirty data in __get_secs_required()
* 75cb6de467ac BACKPORT: f2fs: check number of blocks in a current section
* f9aca4186aa3 UPSTREAM: ALSA: usb-audio: Fix out of bounds reads when finding clock sources
* 5486704a6a0c UPSTREAM: ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices
* c7ba1c1c82ed ANDROID: f2fs: fix wrong backport solution
* 99387ffacbe1 UPSTREAM: usb: xhci: Implement xhci_handshake_check_state() helper
* d63d16bad8b3 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 4c9371533c99 Reapply "UPSTREAM: unicode: Don't special case ignorable code points"
* b0e32912f90b ANDROID: GKI: Update RTK STB KMI symbol list
* e4cf9ae61d4e Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 306b282b55ad UPSTREAM: vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
* 613fa39c6e39 ANDROID: ABI: Add to QCOM symbols list
* d5fddb9f497d UPSTREAM: f2fs: modify f2fs_is_checkpoint_ready logic to allow more data to be written with the CP disable
* 63d2a84c3842 BACKPORT: f2fs: introduce get_available_block_count() for cleanup
* 06a0756a038b ANDROID: GKI: Update symbol list for Amlogic
* 1f1468ace3c7 UPSTREAM: xhci: Fix Link TRB DMA in command ring stopped completion event
* f02dd268a08d UPSTREAM: HID: core: zero-initialize the report buffer
* 7a41b8f987fc ANDROID: KVM: arm64: Always check state from host_ack_unshare()
* f7891041d2a0 FROMLIST: KVM: arm64: Always check the state from hyp_ack_unshare()
* 432831482902 Merge tag 'android14-5.15.170_r00' into android14-5.15
* b7545cdc0876 UPSTREAM: f2fs: fix fiemap failure issue when page size is 16KB
* bce004fba8be ANDROID: mm: Fix SPF-aware fast-mremap
* 4a88640a6818 UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
* 5068194513cf UPSTREAM: f2fs: compress: don't redirty sparse cluster during {,de}compress
* e8453203e033 UPSTREAM: f2fs: compress: don't {,de}compress non-full cluster
* 12e88cda06bf UPSTREAM: f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted
* bac50b47cd84 UPSTREAM: f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on
* d0fad94ed74e UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
* 6f765eb5f47d ANDROID: add file for recording allowed ABI breaks
* f019fd4b7fec BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* 79af9ef7f421 BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* bbed1562731f FROMGIT: binder: allow freeze notification for dead nodes
* 222cf609e25c FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 7d5f29b1f9b0 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* 57a83f36a5b4 BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work()
* c6be0f1005bb FROMGIT: binder: fix OOB in binder_add_freeze_work()
* 84ce22b0bcdb FROMGIT: binder: fix node UAF in binder_add_freeze_work()
* 3d65e7993c42 ANDROID: GKI: Update symbol list for Amlogic
* d731e97f5751 UPSTREAM: Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings"
* d82eee6a7030 BACKPORT: f2fs: compress: fix to update i_compr_blocks correctly
* cd68103d98d3 UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
* e034034fa618 UPSTREAM: arm64/fpsimd: Remove spurious check for SVE support
* 44fce169d13c UPSTREAM: arm64/sme: Set new vector length before reallocating
* cfc4a805cde9 UPSTREAM: tty: serial: qcom_geni: avoid duplicate struct member init

Change-Id: Iac56ee8b0fee996d66e3fc883e474df4c980f3ed
Signed-off-by: Greg Kroah-Hartman <[email protected]>
tree: 8fce3da60482f4cf2ec685093adc4512d4acba4b
  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.gki
  43. build.config.gki-debug.aarch64
  44. build.config.gki-debug.x86_64
  45. build.config.gki.aarch64
  46. build.config.gki.aarch64.fips140
  47. build.config.gki.x86_64
  48. build.config.gki_kasan
  49. build.config.gki_kasan.aarch64
  50. build.config.gki_kasan.x86_64
  51. build.config.gki_kprobes
  52. build.config.gki_kprobes.aarch64
  53. build.config.gki_kprobes.x86_64
  54. build.config.khwasan
  55. build.config.rockpi4
  56. build.config.x86_64
  57. COPYING
  58. CREDITS
  59. Kbuild
  60. Kconfig
  61. Kconfig.ext
  62. MAINTAINERS
  63. Makefile
  64. modules.bzl
  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 [email protected]. 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 <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <[email protected]>

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 <[email protected]>
  • 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 <[email protected]>

        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 <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/[email protected]/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <[email protected]>

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 <[email protected]>
  • 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)