Google Git
Sign in
android / kernel / common / 8a30c9beebe8090696eb3d19648d19304a4f7f8b
commit8a30c9beebe8090696eb3d19648d19304a4f7f8b[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Thu Jun 01 12:55:48 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Thu Jun 01 12:57:01 2023 +0000
treec137e76d0d1b36b82c9c005552e71835ab3d51d5
parent43c801dc3325b9f07f8869e95ad87b05a9f21eb6 [diff]
parent45b8bb886df7422b136ba2703469302d9310974f [diff]
Merge branch 'android13-5.10' into android13-5.10-lts

Catch up on the android13-5.10 branch changes now that the LTS merge has
completed.  This consists of the following changes:

620f443b5a7c Merge branch 'android13-5.10' into android13-5.10-lts
45b8bb886df7 ANDROID: GKI: abi_gki_aarch64_rtkstb: Add symbols for rtkstb heap driver
f075722ce929 UPSTREAM: KVM: x86: do not report a vCPU as preempted outside instruction boundaries
0dd2671df3d3 UPSTREAM: perf: fix perf_event_context->time
ab3443a81b71 UPSTREAM: perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output
1781475257ef ANDROID: Update the ABI representation
1f7d2102afcc ANDROID: Add new hook to enable overriding uclamp_validate()
30b4fb9c5c3e Revert "FROMGIT: usb: gadget: udc: core: Prevent redundant calls to pullup"
40259b07af18 BACKPORT: FROMGIT: Multi-gen LRU: fix workingset accounting
54f6e68ae259 Merge "Merge tag 'android13-5.10.177_r00' into android13-5.10" into android13-5.10
44a76dd3c1f3 Merge tag 'android13-5.10.177_r00' into android13-5.10
5dac3213940f UPSTREAM: ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
a31be8d93c43 ANDROID: vendor_hooks: add vendor hook for dma_heap_buffer_alloc
067da03e3376 ANDROID: teo: Extend ifdef protection for accessing sched_cpu_util
dae3ca472472 UPSTREAM: perf: Fix check before add_event_to_groups() in perf_group_detach()
1e3cd93bd1b2 BACKPORT: cpuidle: teo: Introduce util-awareness
5ef34fccdb9a UPSTREAM: cpuidle: teo: Optionally skip polling states in teo_find_shallower_state()
f93726031274 UPSTREAM: cpuidle: teo: Rename two local variables in teo_select()
9587661efe23 UPSTREAM: cpuidle: teo: Fix alternative idle state lookup
7847e26019fc UPSTREAM: cpuidle: teo: remove unneeded semicolon in teo_select()
69b4d76d0a9b UPSTREAM: cpuidle: teo: Use kerneldoc documentation in admin-guide
be4e6d0dbff6 UPSTREAM: cpuidle: teo: Rework most recent idle duration values treatment
ffffed91822b BACKPORT: mm: Multi-gen LRU: remove wait_event_killable()
80f43853cdee ANDROID: mm: do not allow file-backed pages from CMA
d6606e07404c UPSTREAM: kvm: initialize all of the kvm_debugregs structure before sending it to userspace
ab5254f09b39 UPSTREAM: ext4: fix invalid free tracking in ext4_xattr_move_to_block()
d86ca5aa39d4 ANDROID: GKI: Add ASR KMI symbol list
33b1e2eb04dc Revert "Revert "mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse""
c10825dec4b3 UPSTREAM: cpuidle: teo: Change the main idle state selection logic
39e84907d27e UPSTREAM: cpuidle: teo: Cosmetic modification of teo_select()
5888edb6a44b UPSTREAM: cpuidle: teo: Cosmetic modifications of teo_update()
17792ef02d7a UPSTREAM: cpuidle: teo: Take negative "sleep length" values into account
8187ee16a615 UPSTREAM: cpuidle: teo: Adjust handling of very short idle times
c3c739b87a92 FROMLIST: binder: fix UAF caused by faulty buffer cleanup
c9fa00aeacd8 ANDROID: mm: retry GUP with orignal gup_flags on failure
0dfc31992c28 ANDROID: GKI: Increase max 8250 uarts
c8ff430b7f79 BACKPORT: f2fs: give priority to select unpinned section for foreground GC
1529a2dbb404 BACKPORT: f2fs: check pinfile in gc_data_segment() in advance
cbc2ec3fd17f UPSTREAM: ext4: fix use-after-free in ext4_xattr_set_entry
c8f9713e850b UPSTREAM: ext4: remove duplicate definition of ext4_xattr_ibody_inline_set()
5deed326bd52 UPSTREAM: Revert "ext4: fix use-after-free in ext4_xattr_set_entry"
06005931d646 ANDROID: fuse-bpf: Fix bpf_test_xattr testcase error
64366661e8a9 ANDROID: fuse-bpf: Simplify and fix setting bpf program
956721238f96 ANDROID: fuse-bpf: Fix fuse_dentry_revalidate
d2b52cbb55cc FROMGIT: usb: gadget: udc: core: Prevent redundant calls to pullup
af9ff24a2317 BACKPORT: FROMGIT: usb: gadget: udc: core: Invoke usb_gadget_connect only when started
fa41464b3d26 ANDROID: KVM: arm64: Move addr_is_allowed_memory() check into host callback
18206ce8941f ANDROID: KVM: arm64: Pass addr to get_page_state() helper
736fe45d8b77 UPSTREAM: usb: typec: tcpm: Add support for altmodes
01876c1f3879 UPSTREAM: usb: typec: Add typec_port_register_altmodes()
91fdd255931e ANDROID: GKI: Add RTK STB KMI symbol list
2f2c6f2cf060 BACKPORT: usb: dwc3: gadget: Ignore End Transfer delay on teardown
f3d296bfc1c4 BACKPORT: usb: dwc3: gadget: Only End Transfer for ep0 data phase
ebf7be52971d BACKPORT: usb: dwc3: gadget: Don't delay End Transfer on delayed_status
c0b28ac8b397 BACKPORT: usb: dwc3: gadget: Do not clear ep delayed stop flag during ep disable
1c7619e6803b BACKPORT: usb: dwc3: Avoid unmapping USB requests if endxfer is not complete
b81867fc00a4 BACKPORT: usb: dwc3: gadget: Delay issuing End Transfer
b3f4451b82e7 BACKPORT: usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue
7ded59176144 BACKPORT: usb: dwc3: gadget: move cmd_endtransfer to extra function
6b86d5233696 ANDROID: mm/filemap: Fix missing put_page() for speculative page fault
5fde597537a4 ANDROID: dma-buf: heaps: Don't lock unused dmabuf_page_pool mutex
f8d8d72a7d81 UPSTREAM: of: reserved_mem: Use proper binary prefix
a550d93c939a UPSTREAM: mm: multi-gen LRU: fix crash during cgroup migration
ec8b02c92588 UPSTREAM: usb: gadget: f_uac2: Fix incorrect increment of bNumEndpoints
68b35dfedcc1 UPSTREAM: KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation
40fc945d928b BACKPORT: hugetlb: unshare some PMDs when splitting VMAs
e651e224cb98 UPSTREAM: KVM: arm64: Free hypervisor allocations if vector slot init fails
446883fce5ad UPSTREAM: pstore: Properly assign mem_type property
2261d5cce3c7 UPSTREAM: scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery
8e79f14bb46a UPSTREAM: KVM: arm64: Fix benign bug with incorrect use of VA_BITS
06e6e843a1cf UPSTREAM: coresight: trbe: remove cpuhp instance node before remove cpuhp state
2c2905b52675 BACKPORT: scsi: ufs: core: Fix the polling implementation
8a4dff334332 UPSTREAM: block: mq-deadline: Fix dd_finish_request() for zoned devices
d85e7fbcc30f BACKPORT: arm64: mm: kfence: only handle translation faults
dc0148ee202d UPSTREAM: mm/damon/dbgfs: check if rm_contexts input is for a real context
a807402d28bb UPSTREAM: mm/shmem: use page_mapping() to detect page cache for uffd continue
adafd34979fe UPSTREAM: f2fs: fix gc mode when gc_urgent_high_remaining is 1
336c2f588817 BACKPORT: mm: multi-gen LRU: move lru_gen_add_mm() out of IRQ-off region
5c311ab6a094 UPSTREAM: KVM: arm64: Use correct accessor to parse stage-1 PTEs
69eba5395044 FROMLIST: sched/wait: Fix a kthread_park race with wait_woken()
5c8f4dcbbc48 UPSTREAM: firmware: tegra: Fix error application of sizeof() to pointer
14d0c7d2237c BACKPORT: drm/amd/display: Allocate structs needed by dcn_bw_calc_rq_dlg_ttu in pipe_ctx
2e0d29733365 BACKPORT: drm/amd/display: Pass display_pipe_params_st as const in DML
5e92073713f8 UPSTREAM: ext4: fix kernel BUG in 'ext4_write_inline_data_end()'
e0f4a32ac827 ANDROID: fuse-bpf: Run bpf with migration disabled
59958dee2cdd ANDROID: incremental fs: Evict inodes before freeing mount data
8233931bd607 ANDROID: fuse: fix struct path zero initialization
f96eed0e7bf3 ANDROID: MGLRU: Avoid reactivation of anon pages on swap full
a79f98510908 ANDROID: fuse-bpf: Correctly put backing files
ad92c3750659 ANDROID: fuse: Support errors from fuse daemon in canonical path
e56c90dba513 ANDROID: Update ABI symbols
0dd9f48b93cd UPSTREAM: mm: memcontrol: set the correct memcg swappiness restriction
74a32e3994e5 UPSTREAM: media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
347e7b0cfd0b ANDROID: Fix kernelci break: eventfd_signal_mask redefined
afb74ec9db7d ANDROID: GKI: rockchip: add symbols for dw-dp and skw wifi.
7949efbae946 ANDROID: ABI: Update db845c symbol list for drm_bridge
33b3c95abf06 ANDROID: Export kthread_set_per_cpu
3a0e9d7ecb2d ANDROID: dm-default-key: update for blk_crypto_evict_key() returning void
f38706b8313e BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() more robust
ee0c7832d8cb BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() return void
e7c0e107328a BACKPORT: FROMGIT: blk-mq: release crypto keyslot before reporting I/O complete
d392e4fc27d9 ANDROID: gki_defconfig: enable CONFIG_CRYPTO_GHASH_ARM64_CE
397e2499a9b0 UPSTREAM: hid: bigben_probe(): validate report count
610cbca43056 UPSTREAM: HID: bigben: use spinlock to safely schedule workers
70c84a458be4 UPSTREAM: HID: bigben_worker() remove unneeded check on report_field
89174d3e0bc7 UPSTREAM: HID: bigben: use spinlock to protect concurrent accesses
2ce4ee5f2e02 BACKPORT: USB: gadget: Fix use-after-free during usb config switch
5748fe6d9b52 ANDROID: sched/fair: Remove duplicated trace function
b496bf670e36 ANDROID: fix ABI by undoing atomic64_t -> u64 type conversion
a1ef538264d1 UPSTREAM: net: retrieve netns cookie via getsocketopt
5bd97c87e32e UPSTREAM: net: initialize net->net_cookie at netns setup

Change-Id: I01404921cf961ce4f1c900b5a4ebe921fda53e46
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: c137e76d0d1b36b82c9c005552e71835ab3d51d5
  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.hikey960
  55. build.config.khwasan
  56. build.config.rockchip
  57. build.config.rockpi4
  58. build.config.x86_64
  59. COPYING
  60. CREDITS
  61. Kbuild
  62. Kconfig
  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 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)