Google Git
Sign in
android / kernel / common / refs/heads/android12-5.10-lts
commit27b0c0ace2675b8576bfdc7bee01a84e43563b33[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Sat Feb 22 10:33:12 2025 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Sat Feb 22 10:33:40 2025 +0000
treee6b78c0127dc040941a7c71597e83ea14df8fc51
parent1caf81977768719085dd3135691bb4a134e79f9f [diff]
parent17bea26cbec58f86ccce9a3d88b0e24c0c1e4f93 [diff]
Merge branch 'android12-5.10' into android12-5.10-lts

Catch up on the non-lts changes.  Commits in here include:

* 17bea26cbec5 Merge tag 'android12-5.10.234_r00' into android12-5.10
* 2f598392c515 UPSTREAM: dma-fence: Fix reference leak on fence merge failure path
* e3f3b0baf886 UPSTREAM: dma-buf: fix an error pointer vs NULL bug
* 7567aedc33ea UPSTREAM: dma-buf: keep the signaling time of merged fences v3
* 27f20eaefdb9 UPSTREAM: dma-buf: actually set signaling bit for private stub fences
* 8a5a0de96348 UPSTREAM: dma-buf: set signaling bit for the stub fence
* 6e903a5c1f45 UPSTREAM: dma-buf: Remove the signaled bit status check
* 351db61d355a UPSTREAM: dma-buf: revert "return only unsignaled fences in dma_fence_unwrap_for_each v3"
* 7b3389a1a97f UPSTREAM: dma-buf: generalize dma_fence unwrap & merging v3
* bd2769e4fdab UPSTREAM: dma-buf: return only unsignaled fences in dma_fence_unwrap_for_each v3
* fc0f4d7dcf1f BACKPORT: dma-buf: cleanup dma_fence_unwrap implementation
* 54d0ff9dd6ca UPSTREAM: dma-buf: cleanup dma_fence_unwrap selftest v2
* c186cf297f86 UPSTREAM: dma-buf: cleanup dma_fence_chain_walk
* 2781fe345364 UPSTREAM: dma-buf/sync_file: cleanup fence merging a bit
* 009f0a6dfda1 UPSTREAM: dma-buf: handle empty dma_fence_arrays gracefully
* eccbf603c1cf UPSTREAM: dma-buf/sync-file: fix logic error in new fence merge code
* d2e3466cc975 UPSTREAM: dma-buf/sync-file: fix warning about fence containers
* 2aeb6aef461b BACKPORT: dma-buf: add dma_fence_unwrap v2
* 81b6f83e3300 UPSTREAM: dma-buf: Add dma_fence_array_for_each (v2)
* 005a9bfaa414 UPSTREAM: dma-buf: add dma_fence_chain_contained helper
* 864461168dbd UPSTREAM: dma-buf: clarify dma_fence_add_callback documentation
* b1fe409d2522 UPSTREAM: dma-buf: add dma_fence_chain_alloc/free v3
* 109aa7f8b02d UPSTREAM: drm/syncobj: use newly allocated stub fences
* bc702546abd6 UPSTREAM: dma-buf: use krealloc_array()
* 04bed74afc3c UPSTREAM: mm: slab: provide krealloc_array()
* c31a4e21c9f4 ANDROID: ABI: update symbol list for honor
* f2f0e14b0517 ANDROID: GKI: export usleep_range_state function to support SAGT
* 1b42ee98bc30 ANDROID: vendor_hooks: add vendor hook to support SAGT
* 11421e004a23 UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"
* 489c5991a53c ANDROID: GKI: Update symbol list for honor
* ce8e71332a32 UPSTREAM: binder: log transaction code on failure
* ee6bf96d341f UPSTREAM: binder: add failed transaction logging info
* cf3824ab974a BACKPORT: sched/fair: Move update_nohz_stats() to the CONFIG_NO_HZ_COMMON block to simplify the code & fix an unused function warning
* 154d9fa33676 ANDROID: KABI macros to release excess KABI fields for use with backports
* 08fd4e9d6435 UPSTREAM: usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
* 887a45b8d82a UPSTREAM: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
* 2b48d05158bd UPSTREAM: xhci: Handle TD clearing for multiple streams case
* 8382bc9b23cc UPSTREAM: KVM: arm64: Fix AArch32 register narrowing on userspace write
* 852ccb6ad051 UPSTREAM: usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.

Change-Id: Ic66500a3d24a0e497622d1e83df0b8b431675118
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: e6b78c0127dc040941a7c71597e83ea14df8fc51
  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.config.aarch64
  32. build.config.allmodconfig
  33. build.config.allmodconfig.aarch64
  34. build.config.allmodconfig.arm
  35. build.config.allmodconfig.x86_64
  36. build.config.amlogic
  37. build.config.arm
  38. build.config.common
  39. build.config.db845c
  40. build.config.gki
  41. build.config.gki-debug.aarch64
  42. build.config.gki-debug.x86_64
  43. build.config.gki.aarch64
  44. build.config.gki.aarch64.fips140
  45. build.config.gki.aarch64.fips140_eval_testing
  46. build.config.gki.x86_64
  47. build.config.gki_kasan
  48. build.config.gki_kasan.aarch64
  49. build.config.gki_kasan.x86_64
  50. build.config.gki_kprobes
  51. build.config.gki_kprobes.aarch64
  52. build.config.gki_kprobes.x86_64
  53. build.config.hikey960
  54. build.config.khwasan
  55. build.config.rockchip
  56. build.config.x86_64
  57. COPYING
  58. CREDITS
  59. Kbuild
  60. Kconfig
  61. MAINTAINERS
  62. Makefile
  63. OWNERS
  64. README
  65. 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 script/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)