Google Git
Sign in
android / kernel / common / 36f4f6fb72d5389535cfd2bdb5a29fefe34e3a21
commit36f4f6fb72d5389535cfd2bdb5a29fefe34e3a21[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Fri Jun 16 09:17:32 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Fri Jun 16 09:28:43 2023 +0000
tree7928c9cef72390b99a02a724ae0ab3d6b0a9eaa2
parent19c0ed55a470d1cd766484abab04871b648560fb [diff]
parentebdcd11edcf890293f1fb530c0ece8cd5a5477a7 [diff]
Merge branch 'android13-5.15' into 'android13-5.15-lts'

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

* ebdcd11edcf8 ANDROID: ABI: Update symbols to unisoc whitelist
* c09d2c605efc ANDROID: abi_gki_aarch64_qcom: Add rproc_set_firmware
* 00b1ba8b15f9 ANDROID: vendor_hooks: vendor hook for MM
* 6a33db6d068c UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
* b4ebde0fe37a UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
* 19fe9f69074f Revert "ANDROID: GKI: add vendor hooks to avoid unsupported usb device probing"
* f3284ea22b4e UPSTREAM: 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
* 42fa58b9a377 UPSTREAM: net: qcom/emac: Fix use after free bug in emac_remove due to race condition
* afa948d5af2b ANDROID: GKI: add vendor hooks to avoid unsupported usb device probing
* 2f4e94203746 BACKPORT: power: supply: bq24190: Fix use after free bug in bq24190_remove due to race condition
* ce2c66d2e2ae UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
* 3c816bcc11de UPSTREAM: ALSA: usb-audio: Split endpoint setups for hw_params and prepare
* 27903582a287 UPSTREAM: usb: gadget: uvc: queue empty isoc requests if no video buffer is available
* c27abae93823 FROMGIT: pstore: Revert pmsg_lock back to a normal mutex
* be4040bed108 ANDROID: vendor_hook: Avoid clearing protect-flag before waking waiters
* f713281aa006 ANDROID: ABI: Add to QCOM symbols list
* a40bcba1c561 UPSTREAM: usb: gadget: f_fs: Add unbind event before functionfs_unbind
* df32918f7e28 ANDROID: GKI: Update symbols to symbol list
* 2dffee86eeaa ANDROID: block: export tracepoints
* 22a7f585d008 FROMGIT: usb: gadget: u_serial: Avoid spinlock recursion in __gs_console_push
* 3ff3fb3e75f9 ANDROID: GKI: Add symbols and update symbol list for Unisoc
* f51f079fe30f FROMGIT: usb: gadget: u_serial: Add null pointer check in gserial_suspend
* f62ba41ffaef ANDROID: GKI: Update symbol list for sunxi
* b805b2f70564 BACKPORT: mm: multi-gen LRU: retry pages written back while isolated
* b721f43a760e UPSTREAM: mm: multi-gen LRU: fix crash during cgroup migration
* 76ef69669605 ANDROID: GKI: Revert "ANDROID: GKI: Enable HCTR2"
* bc73c4bb5d3c ANDROID: GKI: Update symbol list for mtk
* 8022ab8aa84a ANDROID: fix ABI breakage caused by per_cpu_pages
* dfc6b6387725 ANDROID: fix ABI breakage caused by adding union type in struct page
* 2bf2b667d944 UPSTREAM: mm/page_alloc: replace local_lock with normal spinlock
* 3cce865cde4b UPSTREAM: mm/page_alloc: remotely drain per-cpu lists
* cf666fb5695a BACKPORT: mm/page_alloc: protect PCP lists with a spinlock
* bd093f8791f2 UPSTREAM: mm/page_alloc: remove mistaken page == NULL check in rmqueue
* 30888d2792c7 BACKPORT: mm/page_alloc: split out buddy removal code from rmqueue into separate helper
* a1cab2700196 BACKPORT: mm/page_alloc: add page->buddy_list and page->pcp_list
* 3a5551e6cac5 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 9c533fb707d3 ANDROID: gki_defconfig: enable CONFIG_SYN_COOKIES
* 81edb450dde9 ANDROID: update the .xml file based on previous LTS merge
*   d00dcb7d762c Merge "Merge tag 'android13-5.15.104_r00' into android13-5.15" into android13-5.15
|\
| * 23818c192b15 Merge tag 'android13-5.15.104_r00' into android13-5.15
* | 1247e4a9ca82 BACKPORT: FROMGIT: Multi-gen LRU: fix workingset accounting
* | 99e45d1651e9 ANDROID: ABI: Update symbols to unisoc whitelist
|/
* 9fdde2b21a4a ANDROID: remove CONFIG_NET_CLS_TCINDEX from gki_defconfig
* f4bcd6371664 BACKPORT: net/sched: Retire tcindex classifier
* 75d202bb9b43 UPSTREAM: ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
* a9903644f06e ANDROID: ABI: Update allowed list for QCOM
* 046143027398 UPSTREAM: usb: dwc3: fix gadget mode suspend interrupt handler issue
* 8faa860f5594 BACKPORT: usb: gadget: udc: Handle gadget_connect failure during bind operation
* 3a0a7c82a9d5 FROMGIT: usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens
* 10d315f83545 BACKPORT: mm: Multi-gen LRU: remove wait_event_killable()
* 2e5e23042fb0 UPSTREAM: perf: fix perf_event_context->time
* de46338f53ed UPSTREAM: perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output
* dc031e19fad9 UPSTREAM: perf: Fix check before add_event_to_groups() in perf_group_detach()
* 9e92bfe8fd6f ANDROID: GKI: Update symbols to symbol list
* b5d2e9c99d74 ANDROID: vendor_hook: add hooks in dm_bufio.c
* ddfd56a6adbc UPSTREAM: of: reserved_mem: Use proper binary prefix
* 7d6c6a17156f BACKPORT: of: reserved-mem: print out reserved-mem details during boot
* 5daddf0e061b BACKPORT: swiotlb: relocate PageHighMem test away from rmem_swiotlb_setup
* 8ccda1f68385 UPSTREAM: ext4: fix invalid free tracking in ext4_xattr_move_to_block()
* 343808251d16 BACKPORT: FROMGIT: binder: add lockless binder_alloc_(set|get)_vma()
* 7d51cccdd92b BACKPORT: FROMGIT: Revert "binder_alloc: add missing mmap_lock calls when using the VMA"
* 43b43053a4ab ANDROID: fix merge issue in binder_alloc_set_vma()
* adaabe3996c3 UPSTREAM: usb: dwc3: debugfs: Resume dwc3 before accessing registers
* a34daa1c47b5 UPSTREAM: kvm: initialize all of the kvm_debugregs structure before sending it to userspace
* f993c1a2b07f UPSTREAM: netfilter: nf_tables: deactivate anonymous set from preparation phase
* 0f765cae4a01 UPSTREAM: usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
* c5de3d68b074 FROMGIT: locking/rwsem: Add __always_inline annotation to __down_read_common() and inlined callers
* 1ce1603175da BACKPORT: UPSTREAM: usb: dwc3: gadget: Execute gadget stop after halting the controller
* 3dd76c4a0d9a ANDROID: irqchip/irq-gic-v3: Fixed gic_suspend() stub for !CONFIG_PM
* c2d82f46fc90 ANDROID: ABI: Update symbol list for the symbols used by the unisoc for A13-k5.15
* 82aad30f4374 UPSTREAM: usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
* a881d6f4e599 BACKPORT: FROMLIST: thermal/core/power_allocator: avoid thermal cdev can not be reset
* 424075e4eff1 Revert "ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained"
* e38f3666ea35 BACKPORT: FROMGIT: wifi: cfg80211/mac80211: report link ID on control port RX
* 9caa51de34bf FROMLIST: binder: fix UAF caused by faulty buffer cleanup
* 9ad803f257a8 ANDROID: usb: gadget: configfs: Protect composite_setup in a spinlock
* db8d05e8f04c ANDROID: ABI: update allowed list for galaxy
* 5227c476172c ANDROID: GKI: Increase max 8250 uarts
* b70e2af3bdc0 BACKPORT: f2fs: give priority to select unpinned section for foreground GC
* 7c4a265d2a21 UPSTREAM: f2fs: check pinfile in gc_data_segment() in advance
* 1e1a53284552 ANDROID: GKI: add missing vendor hook symbols
* e6dabdbadf3c ANDROID: GKI: reorder symbols within ABI files
* d7d2be8fd513 ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table.
* 77f51b165521 ANDROID: fuse-bpf: Fix bpf_test_xattr testcase error
* 2c1967007d7b ANDROID: fuse-bpf: Remove OWNERS file
* e7df7ebf4010 ANDROID: ABI: Add to QCOM symbols list
* 7a661c41ccd8 ANDROID: fuse-bpf: Simplify and fix setting bpf program
* 7671fd7ee932 BACKPORT: FROMLIST: arm64: Also reset KASAN tag if page is not PG_mte_tagged
* c5044e240d16 ANDROID: fuse-bpf: Make fuse_test compile and pass
* b35a06182451 ANDROID: KVM: arm64: Move addr_is_allowed_memory() check into host callback
* 53625a846a7b ANDROID: KVM: arm64: Pass addr to get_page_state() helper
* 2c5e83243672 ANDROID: abi_gki_aarch64_qcom: Add android_vh_ufs_prepare_command
* c86e2416fd14 ANDROID: fix use of plain integer as NULL pointer
* 917230326184 UPSTREAM: usb: gadget: udc: core: remove usage of list iterator past the loop body
* ac3cf8a41a5e UPSTREAM: usb: gadget: udc: core: Print error code in usb_gadget_probe_driver()
* d3e95905cee3 FROMLIST: usb: xhci: Remove unused udev from xhci_log_ctx trace event
* 1539137fce2e FROMGIT: usb: dwc3: gadget: Add 1ms delay after end transfer command without IOC
* 4f1a12293759 UPSTREAM: usb: gadget: udc: core: Use pr_fmt() to prefix messages
* 283ccf3c2816 ANDROID: GKI: Update symbol list for Amlogic
* 69e55fed9420 ANDROID: GKI: Update symbol list for mtk
* 67510f5083a5 ANDROID: setlocalversion: Add a flag to keep tag info
* 5e6e9c596be6 ANDROID: clear memory trylock-bit when page_locked.
* 805cf5299117 UPSTREAM: fs: drop peer group ids under namespace lock
* 4158b1508f2b Revert "Revert "mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse""
* e269893a9b54 ANDROID: GKI: Update symbol list for mtk
* 875c05325196 ANDROID: dma-buf: heaps: Don't lock unused dmabuf_page_pool mutex
* 2f051979ea09 ANDROID: Updatae the GKI symbol list and ABI XML.
* 30edea77f778 ANDROID: gki_defconfig: enable CONFIG_BLK_CGROUP_IOPRIO
* ec96f224148a FROMLIST: [PATCH v2] tick/broadcast: Do not set oneshot_mask except was_periodic was true
* ff29d7e59d15 UPSTREAM: KVM: VMX: Move preemption timer <=> hrtimer dance to common x86
* 428069e9c615 ANDROID: GKI: Update symbol list for Unisoc
* a6dcbbd57fd6 ANDROID: abi_gki_aarch64_qcom: update abi
* 6ccb91c80a50 BACKPORT: FROMGIT: rcu: Avoid freeing new kfree_rcu() memory after old grace period
* 0491ec319e94 ANDROID: MGLRU: Avoid reactivation of anon pages on swap full
* 5959a6946f6a ANDROID: fuse-bpf: Run bpf with migration disabled
* f01e7da91fa7 ANDROID: incremental fs: Evict inodes before freeing mount data
* fe8e1408d916 ANDROID: GKI: Update symbol list for Amlogic
* fd28863aa497 ANDROID: fuse-bpf: Correctly put backing files
* 8e6265391ea9 UPSTREAM: media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
* 617c5ccc25ec UPSTREAM: hid: bigben_probe(): validate report count
* e422c244a9b2 UPSTREAM: HID: bigben: use spinlock to safely schedule workers
* 7516b4d0ff7e ANDROID: Fix kernelci break: eventfd_signal_mask redefined
* f3a30a028ef9 ANDROID: fuse: fix struct path zero initialization
* ee002ea6adbe UPSTREAM: Makefile: use -gdwarf-{4|5} for assembler for DEBUG_INFO_DWARF{4|5}
* 1fd3cdb1c245 UPSTREAM: HID: bigben_worker() remove unneeded check on report_field
* 2cabed5f0265 UPSTREAM: HID: bigben: use spinlock to protect concurrent accesses
* 35ff3e8cb6c4 ANDROID: gki_defconfig: enable CONFIG_CRYPTO_GHASH_ARM64_CE
* d3b24dd2c79a ANDROID: dm-default-key: update for blk_crypto_evict_key() returning void
* 75a94121008c BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() more robust
* 4f1318871f96 BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() return void
* 1f978b52162d BACKPORT: FROMGIT: blk-mq: release crypto keyslot before reporting I/O complete
* f08d600c31ce ANDROID: GKI: Update symbol list for mtk
* afcf7ac2f333 UPSTREAM: of: base: Skip CPU nodes with "fail"/"fail-..." status
* 44a94ece4726 ANDROID: fuse: Support errors from fuse daemon in canonical path
* 30c810b80914 ANDROID: fsnotify: Notify lower fs of open
* 00d76c2ca4a8 UPSTREAM: ARM: 9203/1: kconfig: fix MODULE_PLTS for KASAN with KASAN_VMALLOC
* 37bcdf00abfd UPSTREAM: ARM: 9202/1: kasan: support CONFIG_KASAN_VMALLOC

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