Git Browser for ODROID
Code Review Sign In
git.odroid.com / yocto / kernel / common / 0e6932267072df335aae38c2eee95fdb4ba464c6
commit0e6932267072df335aae38c2eee95fdb4ba464c6[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Fri Jan 26 03:05:39 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Fri Jan 26 03:06:45 2024 +0000
tree05d752b61fbda84e5e3f04689c3d208fd7a0159a
parent2c882816b11604f33ee3b2039a5f067d503694ce [diff]
parent1982cd32ae223abab872d168f573e9e0bbfc9c02 [diff]
Merge branch 'android14-5.15' into branch 'android14-5.15-lts'

A back-merge to catch the latest changes that are in the android14-5.15
branch.  This contains the following commits:

* 1982cd32ae22 ANDROID: GKI: Remove CONFIG_MEDIA_CEC_RC
*   270ce44fdb91 Merge "Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15'" into android14-5.15
|\
| * f26b6b03905f Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15'
* | 9a196e80511d ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic
* | debd0f470b36 ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value
* | cf1268f69660 UPSTREAM: usb: gadget: uvc: Remove nested locking
* | c9395ddbaa33 UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
* | 7a71ed71fc0b ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
* | da99db444bac ANDROID: Update the ABI symbol list
* | 4f66f3be95b5 ANDROID: Export sysctl_sched_min_granularity
* | e32aeb03b9c6 UPSTREAM: sched/fair: Limit sched slice duration
* | b9e9a2c0094d FROMGIT: mm: update mark_victim tracepoints fields
* | 61d5f76a9038 UPSTREAM: mmc: core: Do not force a retune before RPMB switch
* | d85e6cb67922 ANDROID: GKI: add symbol list for etm driver
* | eb31cad2df51 UPSTREAM: coresight: tmc: Don't enable TMC when it's not ready.
* | 57ddb1ecd70e UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions
|/
* a4da62d21c8b FROMGIT: usb: dwc3: gadget: Handle EP0 request dequeuing properly
* 0d3c49180f62 UPSTREAM: usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
* 154a4394d0a2 UPSTREAM: usb: dwc3: gadget: Execute gadget stop after halting the controller
* 0b1767af4883 BACKPORT: usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
* b68fafef5646 UPSTREAM: usb: dwc3: gadget: Submit endxfer command if delayed during disconnect
* 02524b75195a UPSTREAM: usb: dwc3: ep0: Don't prepare beyond Setup stage
* 149320568d1b ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area
* d0cdb904f99a ANDROID: GKI: Update symbol list for Amlogic
* a95b355479d9 UPSTREAM: bcache: move uapi header bcache.h to bcache code directory
* 6246b8f3ef46 UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
* 60489918456c ANDROID: KVM: arm64: Avoid BUG-ing from the host abort path
* 38cb0b11813e ANDROID: GKI: Update symbol list for lenovo
* 3cd672870a67 ANDROID: binder: fix KMI-break due to alloc->lock
* 63f7ddea2e48 ANDROID: binder: fix KMI-break due to address type change
* 74ecd99c1597 BACKPORT: FROMGIT: binder: switch alloc->mutex to spinlock_t
* 5a8658eac391 BACKPORT: FROMGIT: binder: reverse locking order in shrinker callback
* f0667c870ce0 FROMGIT: binder: avoid user addresses in debug logs
* b93c9f8565f5 FROMGIT: binder: refactor binder_delete_free_buffer()
* f6b1c043ae01 FROMGIT: binder: collapse print_binder_buffer() into caller
* 683f84a35f64 FROMGIT: binder: document the final page calculation
* 4c82cbad436e BACKPORT: FROMGIT: binder: rename lru shrinker utilities
* eba1fb9603c8 UPSTREAM: drivers/android: remove redundant ret variable
* 356047fe2a07 FROMGIT: binder: make oversized buffer code more readable
* f7476dca313c FROMGIT: binder: remove redundant debug log
* 477e8e84539a BACKPORT: FROMGIT: binder: perform page installation outside of locks
* af711934126e FROMGIT: binder: initialize lru pages in mmap callback
* ef524f4dd410 FROMGIT: binder: malloc new_buffer outside of locks
* b23dbdbf1953 BACKPORT: FROMGIT: binder: refactor page range allocation
* 59e0d62fc8f0 BACKPORT: FROMGIT: binder: relocate binder_alloc_clear_buf()
* 081ddad21638 FROMGIT: binder: relocate low space calculation
* e1d195e94d3c FROMGIT: binder: separate the no-space debugging logic
* 26d06d934990 FROMGIT: binder: remove pid param in binder_alloc_new_buf()
* d5c44f906592 FROMGIT: binder: do unlocked work in binder_alloc_new_buf()
* 0b24368fffaa FROMGIT: binder: split up binder_update_page_range()
* c38a89805ff5 FROMGIT: binder: keep vma addresses type as unsigned long
* ca5c7be9e09a FROMGIT: binder: remove extern from function prototypes
* 2a250a1528c1 FROMGIT: binder: fix comment on binder_alloc_new_buf() return value
* 26f0c013485f FROMGIT: binder: fix trivial typo of binder_free_buf_locked()
* 11ca07657c49 FROMGIT: binder: fix unused alloc->free_async_space
* 65cf1585ea76 FROMGIT: binder: fix async space check for 0-sized buffers
* 1787dddd970a FROMGIT: binder: fix race between mmput() and do_exit()
* 8dce2880bce6 FROMGIT: binder: fix use-after-free in shinker's callback
* 3c4732563eeb FROMGIT: binder: use EPOLLERR from eventpoll.h
* 486b17a0962f ANDROID: GKI: Update symbol list for Amlogic
* bfefe25dfa07 UPSTREAM: bpf: Fix prog_array_map_poke_run map poke update
* 274748592eed ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y
* 597362d44ff8 ANDROID: KVM: arm64: Don't prepopulate MMIO regions for host stage-2
* 45d542adb421 ANDROID: KVM: arm64: Fix host_smc print typo
* 38bb85f2fba4 ANDROID: KVM: arm64: Fix hyp event alignment
* c09c7c05d0de ANDROID: KVM: arm64: Document module_change_host_prot_range
* 80d91f64baa2 BACKPORT: USB: gadget: core: adjust uevent timing on gadget unbind
* 19a4494b2b29 ANDROID: GKI: Update RTK STB KMI symbol list
* 55f6a969754a UPSTREAM: dm verity: don't perform FEC for failed readahead IO
* 781393c0a2bc UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* 97c69470fe01 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
* 16ea59408c63 ANDROID: fuse-bpf: Follow mounts in lookups
* abea1cb16e43 ANDROID: Snapshot Mainline's version of checkpatch.pl
* 9f6f0c1de5af ANDROID: GKI: Update symbol list for Amlogic
* a5123cff8d07 ANDROID: KVM: arm64: Skip prefaulting ptes which will be modified later
* 97bbbf4497d5 ANDROID: KVM: arm64: Introduce module_change_host_prot_range
* 1dc2dbbb57cb ANDROID: KVM: arm64: Relax checks in module_change_host_page_prot
* b43baa770bbc ANDROID: KVM: arm64: Optimise module_change_host_page_prot
* dc87f3522eec ANDROID: KVM: arm64: Prefault entries when splitting a block mapping
* ab6f88aebe2f ANDROID: GKI: Update symbol list for transsion
* 896cff873452 ANDROID: Add vendor_hooks to workaround CONFIG_TASK_DELAY_ACCT
* 3d3f9377b26b ANDROID:  Add missing symbol for QCOM
* 5feaf92b247c UPSTREAM: binder: fix memory leaks of spam and pending work
* 92bef7c6afd2 UPSTREAM: mm,kfence: decouple kfence from page granularity mapping judgement
* e6ffb329ee95 UPSTREAM: arm64/mm: fold check for KFENCE into can_set_direct_map()
* b39c28c44c8a ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
* d0b481d97e43 ANDROID: fix up rpmsg_device ABI break
* 6bfb30205b08 ANDROID: fix up platform_device ABI break
* 649e9135df7c UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* b1e39deac4ed UPSTREAM: rpmsg: glink: Release driver_override
* 9697a1648059 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* 01b4519a41dd BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* d82ae69002eb UPSTREAM: rpmsg: Constify local variable in field store macro
* 341acb7baca5 UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* 81051a615f3b Revert "ANDROID: Enable CONFIG_KUNIT=y."
* 1d5461bec0d0 Revert "ANDROID: Add kunit targets."
* 12ab8f1569da UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
* 3a7b8e544bf4 ANDROID: arm64: Remove a bunch of duplicate errata hunks
* 4ba6c3197cb6 ANDROID: arm64: Disable workaround for CPU errata 2441007 and 2441009
* 0bea71c86296 ANDROID: abi_gki_aarch64_qcom: Add GIC and hibernation APIs
* 3923e9952d41 ANDROID: irqchip/irq-gic-v3: Add vendor hook for gic suspend
* bd5883688256 ANDROID: Update the ABI representation
* 16a47663f59f BACKPORT: fscrypt: support crypto data unit size less than filesystem block size
* a934b92361fd ANDROID: mm: do not allow file-backed pages from CMA
* 35482d0d3877 UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path
* e19a3cd1cefd ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
* 5421e17c171f ANDROID: Update the ABI symbol list
* 46f8b2ca5884 ANDROID: GKI: add a vendor hook in ptep_clear_flush_young()
* 0add0e52ef2b UPSTREAM: fs: drop_caches: draining pages before dropping caches
*   0d1f309e44f8 Merge "Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15'" into android14-5.15
|\
| * 6dfd4d406c10 Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15'
* | 73c2c0d53d8f ANDROID: Update the ABI symbol list
* | 87344b2ab782 ANDROID: sched: Add trace_android_rvh_set_user_nice_locked
|/
* bd1e76c09b1b ANDROID: GKI: update symbol list
* fdaddcab764a ANDROID: GKI: vendor code needs __balance_callbacks access
* e2fbc5cc3af6 ANDROID: KVM: arm64: pkvm_module_ops documentation
* bf291bdd7033 UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
* 52ecdc264d63 UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
* a7f103722b57 UPSTREAM: USB: core: Change usb_get_device_descriptor() API
* 28e703ec0512 UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads
* e5f9357102a7 ANDROID: GKI: Update symbol list for lenovo
* dcf95aa0af7a FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
* 8078e50f5ea3 FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
* 00417482153b FROMGIT: usb: gadget: uvc: move video disable logic to its own function
* 563283055b8e FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
* 848fa308a916 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
* 24e0a18cb422 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 8ab43e8a3e6d ANDROID: arch_topology: Add android_rvh_update_thermal_stats
* 6ac8b4fbb4eb ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
* 4030b1eeed2b ANDROID: GKI: update symbol list for lenovo
* 71647086d710 ANDROID: GKI: add a vendor hook in cpufreq_online
* 2cecfa7378f6 FROMGIT: Input: uinput - allow injecting event times
* e9a7a2060ac7 ANDROID: Update the ABI symbol list
* 984523c36842 ANDROID: sched: Add vendor hook for update_load_sum
* f88c9605bd48 ANDROID: GKI: update mtktv symbol
* b6fd46aaf180 ANDROID: GKI: Add symbol list for Transsion
* 17d202d85b14 ANDROID: KVM: arm64: mount procfs for pKVM module loading
* be8f9c8bf9fb ANDROID: GKI: Update symbol list for Amlogic
* 76fcf197f257 UPSTREAM: ASoC: soc-compress: Fix deadlock in soc_compr_open_fe
* 7f194d670f2d BACKPORT: ASoC: add snd_soc_card_mutex_lock/unlock()
* 8cdc41d9b82f BACKPORT: ASoC: expand snd_soc_dpcm_mutex_lock/unlock()
* 2721efad0a36 BACKPORT: ASoC: expand snd_soc_dapm_mutex_lock/unlock()
* b7bcf839e1d2 ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort()
* 27aaaa9af55e ANDROID: GKI: Update symbol list for Amlogic
* 0681d570bab5 ANDROID: mm: add vendor hook in isolate_freepages()
* f206a8c31ce1 ANDROID: GKI: Update symbol list for Amlogic
* 88b56693e9cc ANDROID: GKI: Update symbol list for rtktv
* dbeed231965e ANDROID: fs/passthrough: Fix compatibility with R/O file system
* bde02310d4b4 ANDROID: Update the ABI symbol list
* 71320d0c1e99 Revert "ANDROID: KVM: arm64: Don't allocate from handle_host_mem_abort"
* 7b356cb3002e UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
* 7d75f8038b91 UPSTREAM: vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()
* 484868e95c13 BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
* ae71397d9023 BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
* f5beeb23ed2c UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
* 65aa3dd94a92 UPSTREAM: usb: gadget: function: Remove unused declarations
* 81bffd1c1a5a UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump
* 0772c040aea2 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* 069cc1491e62 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 501954e892e6 BACKPORT: usb: typec: altmodes/displayport: Signal hpd low when exiting mode
* b39c40b6933a ANDROID: Update the ABI symbol list
* 858e65da9cf4 ANDROID: f2fs: Fix the calculation of the number of zones
* 2eb175772dd6 ANDROID: GKI: Update symbol list for lenovo
* 0a25bb8f1cd2 ANDROID: KVM: arm64: Fix KVM_HOST_S2_DEFAULT_MMIO_PTE encoding

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