Google Git
Sign in
android / kernel / common / 424f92bcbe8fa613ada7aec5ebe4ef434d5e50e4
commit424f92bcbe8fa613ada7aec5ebe4ef434d5e50e4[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Mon May 20 17:34:53 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Mon May 20 17:35:57 2024 +0000
tree2cf70eaffd36e63379e5ed990effc3552d5d35fb
parent5d96939590c0122be2138255c921e57e3f78b7bd [diff]
parent07a628899ca93df312347c7ebc1b5f80a97e9d19 [diff]
Merge branch 'android13-5.15' into branch 'android13-5.15-lts'

This catches the android13-5.15-lts branch up with recent changes in
android13-5.15, including some ABI symbols that need to be properly
tracked.

Included in here are the following commits:

* 07a628899ca9 ANDROID: GKI: Update symbol list for mtk
* 6cc1dacf6e1f ANDROID: usb: Optimize the problem of slow transfer rate in USB accessory mode
* edafa7e50380 ANDROID: GKI: Add symbol list for exynosauto
* 2b1828f3335b FROMGIT: usb: dwc3: Wait unconditionally after issuing EndXfer command
* b1a7a4c4e917 ANDROID: GKI: Update symbol list for vivo
* 252025c86738 ANDROID: vendor_hooks: add hooks for exting task's swp_entrys
* b2e6f8e1e968 ANDROID: ABI: Update honor symbol list
* 8f68ff0b3bd6 ANDROID: add vendor hook in do_read_fault to tune fault_around_bytes
* 0eccf4c01e79 ANDROID: 16K: Fix show maps CFI failure
* 9e5fc85b35b8 ANDROID: 16K: Handle pad VMA splits and merges
* 0c5b08de5ce6 ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 836c41d3817f ANDROID: 16K: Only madvise padding from dynamic linker context
* 6b0dc4512983 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* b45b2c51be1a ANDROID: 16K: Exclude ELF padding for fault around range
* 8629cff1ef5b ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* e62af1bda9dd ANDROID: 16K: Introduce ELF padding representation for VMAs
* 40a6ca0d9e28 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* 5f1f78548221 ANDROID: Add symbol list for ARCVM
* 804531aefd9d ANDROID: Add CONFIG_NET_9P
* 1d6838aa978b ANDROID: Enable CONFIG_LAZY_RCU in x86 gki_defconfig
* 11c8ba3339ce ANDROID: Enable CONFIG_LAZY_RCU in arm64 gki_defconfig
* b657edec328a FROMLIST: rcu: Provide a boot time parameter to control lazy RCU
* a29842852f14 ANDROID: rcu: Add a minimum time for marking boot as completed
* c4e857dad7b3 UPSTREAM: rcu/kvfree: Move need_offload_krc() out of krcp->lock
* b9f7b61af8b4 UPSTREAM: rcu/kfree: Fix kfree_rcu_shrink_count() return value
* d13996c4bdfe UPSTREAM: rcu/kvfree: Update KFREE_DRAIN_JIFFIES interval
* 8309b1d65721 UPSTREAM: rcu/kvfree: Remove useless monitor_todo flag
* 96b2f1a1e140 UPSTREAM: scsi/scsi_error: Use call_rcu_hurry() instead of call_rcu()
* 145e58eb8b7a ANDROID: rxrpc: Use call_rcu_hurry() instead of call_rcu()
* 0f3566bf2428 UPSTREAM: net: devinet: Reduce refcount before grace period
* 3b7f9eb63ea0 UPSTREAM: rcu: Disable laziness if lazy-tracking says so
* b93701c782c8 UPSTREAM: rcu: Track laziness during boot and suspend
* ee7f3754a927 UPSTREAM: net: Use call_rcu_hurry() for dst_release()
* 16944215a89b UPSTREAM: percpu-refcount: Use call_rcu_hurry() for atomic switch
* a8407542c930 UPSTREAM: rcu/sync: Use call_rcu_hurry() instead of call_rcu
* 7297afa4dd2c UPSTREAM: rcu: Refactor code a bit in rcu_nocb_do_flush_bypass()
* 107b3bf6c040 BACKPORT: rcu: Shrinker for lazy rcu
* cca23ea66214 BACKPORT: rcu: Make call_rcu() lazy to save power
* 2fa81068336b UPSTREAM: rcu: Fix late wakeup when flush of bypass cblist happens
* b12f387c42ae BACKPORT: rcu: Fix missing nocb gp wake on rcu_barrier()
* 415bf493ba99 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 82234d013970 UPSTREAM: netfilter: nft_set_pipapo: do not free live element
* 897b4b44ae08 UPSTREAM: af_unix: Fix garbage collector racing against connect()
* eb5cd3fdd131 UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* f58e0ae24485 ANDROID: GKI: Update symbols to symbol list
* 73d5698bc91c ANDROID: vendor_hook: Add hooks to support reader optimistic spin in rwsem
* 9e6a12999b1e UPSTREAM: usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
* f9f189de29a1 ANDROID: GKI: Update symbols to symbol list
* 78a68f420444 ANDROID: GKI: update symbol list file for xiaomi
* 07c8a0788310 ANDROID: ABI: Update oplus symbol list
* 63070883166a ANDROID: mm: fix incorrect unlock mmap_lock for speculative swap fault
* 443bd6f98e3b UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* c25b967bc9a9 UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* bc808fbfa6f2 UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout

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