Google Git
Sign in
android / kernel / common / b4bd207b0380c89a7134705d0cddb3541912562b
commitb4bd207b0380c89a7134705d0cddb3541912562b[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Mon Dec 16 11:52:49 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Mon Dec 16 11:53:27 2024 +0000
tree9d8dd5d872bec995e89734965362b94b0c2bd5d5
parent6f0de8f8a16565068c241273f4410783ed8f6c8c [diff]
parentf00e8bc3372e3c159248636cf1180a1ad712f442 [diff]
Merge branch 'android13-5.15' into android13-5.15-lts

Back-merge the recent changes and merge in android13-5.15 into the -lts
branch.  Changes in here include:

* f00e8bc3372e Merge tag 'android13-5.15.170_r00' into android13-5.15
* c37662841565 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* b8491ccda684 UPSTREAM: vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
* 5b151cac0f05 UPSTREAM: f2fs: modify f2fs_is_checkpoint_ready logic to allow more data to be written with the CP disable
* 3cee79b391b4 BACKPORT: f2fs: introduce get_available_block_count() for cleanup
* 8550525c9c3e UPSTREAM: xhci: Fix Link TRB DMA in command ring stopped completion event
* 07c59bff0a1a UPSTREAM: HID: core: zero-initialize the report buffer
* af7b32e5ddef ANDROID: KVM: arm64: Always check state from host_ack_unshare()
* dec98f7f3957 FROMLIST: KVM: arm64: Always check the state from hyp_ack_unshare()
* b877b7c1228a Merge tag 'android13-5.15.168_r00' into android13-5.15
* f913f0123e6c ANDROID: mm: Fix SPF-aware fast-mremap
* 17303218f16e UPSTREAM: scsi: ufs: core: Do not set link to OFF state while waking up from hibernation
* dfb1275f6732 UPSTREAM: usb: gadget: uvc: Correct documentation formatting
* b385eb76d455 UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
* d077e8e037af UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
* 952e16e5fc48 ANDROID: add file for recording allowed ABI breaks
* fa62043463fa ANDROID: GKI: update symbol list for honor
* fd804d117697 ANDROID: vendor_hooks: add hook to record reboot reason
* 9f3eb4a6fc7c ANDROID: GKI: update symbol list for honor
* 7cf81233023c ANDROID: Allow vendor modules perform more operations on memleak detect
* 234ac5aa81b1 BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* 00a4e7172ddb BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* 1853fe028c05 FROMGIT: binder: allow freeze notification for dead nodes
* 93be4d6a12e2 FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 74910cb030d7 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* e5f257275e62 BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work()
* 35dc5ccaff55 FROMGIT: binder: fix OOB in binder_add_freeze_work()
* 29f5a2bc6c4b FROMGIT: binder: fix node UAF in binder_add_freeze_work()
* 9b33c48a66b6 ANDROID: GKI: update symbol list for honor
* ac18e4d59189 ANDROID: vendor_hooks: add hook to record slab alloc and free
* 23535eb80608 BACKPORT: f2fs: return true if all cmd were issued or no cmd need to be issued for f2fs_issue_discard_timeout()
* 4d48c169f3d2 BACKPORT: f2fs: don't call f2fs_issue_discard_timeout() when discard_cmd_cnt is 0 in f2fs_put_super()
* 18cd0c21a1c8 ANDROID: GKI: Update symbol list for Amlogic
* b605983718de UPSTREAM: Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings"
* a5a4183e4aad BACKPORT: f2fs: compress: fix to update i_compr_blocks correctly
* 3eab0eeda887 UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
* 555c69901c2d ANDROID: GKI: Add additional symbols for honor

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