Google Git
Sign in
android / kernel / common / 7364b7abbafbeaab61d763c46d84145488b98a3c
commit7364b7abbafbeaab61d763c46d84145488b98a3c[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Mon Mar 27 13:19:01 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Mon Mar 27 16:28:55 2023 +0000
treeb21875f8e1879b557e68785b153a535f8e2ae083
parentfa7bbebb182b97b8a9bfb5bb8babe657b9fd0847 [diff]
parent5476e160a6a608824caf9f32890676e7fcffb762 [diff]
Merge branch 'android13-5.15' into android13-5.15-lts

Sync up with android13-5.15 for the following commits:

*   5476e160a6a6 Merge "Merge tag 'android13-5.15.94_r00' into android13-5.15" into android13-5.15
|\
| * 51556245492e Merge tag 'android13-5.15.94_r00' into android13-5.15
* | e5862f1a4060 UPSTREAM: wifi: nl80211: fix puncturing bitmap policy
|/
* f8c9753a1256 UPSTREAM: hwrng: virtio - add an internal buffer
* 1dddc1992eae ANDROID: GKI: Update abi_gki_aarch64_qcom
* 092199e995ef BACKPORT: wifi: nl80211: Allow authentication frames and set keys on NAN interface
* 05164a8564ba UPSTREAM: wifi: cfg80211: Allow action frames to be transmitted with link BSS in MLD
* 6bab8a400278 BACKPORT: wifi: cfg80211: include puncturing bitmap in channel switch events
* e8a4772f4d12 BACKPORT: wifi: nl80211: validate and configure puncturing bitmap
* b099f1eb0b33 UPSTREAM: regmap: Don't warn about cache only mode for devices with no cache
* b3ebd7ca3bd6 ANDROID: dma-buf: system_heap: kmap_local_page instead of kmap_atomic
* 16e9875abd44 ANDROID: GKI: update xiaomi symbol list
* cf18e5eb5ef2 UPSTREAM: ext4: fix another off-by-one fsmap error on 1k block filesystems
* 090c1ebf8df4 UPSTREAM: dm verity: stop using WQ_UNBOUND for verify_wq
* 7f356bba0251 BACKPORT: dm verity: enable WQ_HIGHPRI on verify_wq
* 4017ffbb86e8 UPSTREAM: dm verity: remove WQ_CPU_INTENSIVE flag since using WQ_UNBOUND
* a6c4727f6a53 UPSTREAM: loop: Fix use-after-free issues
* 24c1fcb7878c ANDROID: GKI: Update symbol list for mtk
* 6c60fdbac2c9 UPSTREAM: ext4: block range must be validated before use in ext4_mb_clear_bb()
* 53ce0eef4695 UPSTREAM: ext4: add strict range checks while freeing blocks
* 20389d86cb01 UPSTREAM: ext4: add ext4_sb_block_valid() refactored out of ext4_inode_block_valid()
* 60c24f4d1535 UPSTREAM: ext4: refactor ext4_free_blocks() to pull out ext4_mb_clear_bb()
* 7ba7908a8d52 ANDROID: mm: handle SPF using a copy of the original vma
* 521f3bc70dc8 ANDROID: mm: fix UAF in SPF
* e09118b90b6f ANDROID: GKI: Update symbol list for mtk
* 0659efffd9d3 UPSTREAM: arm64: efi: Make efi_rt_lock a raw_spinlock
* 6b908238a81e UPSTREAM: wifi: cfg80211: Set SSID if it is not already set
* 554a9671671a Revert "Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests""
* eef9e1295bde UPSTREAM: rtmutex: Ensure that the top waiter is always woken up
* cc0db0b28cfc UPSTREAM: cgroup/cpuset: Don't filter offline CPUs in cpuset_cpus_allowed() for top cpuset tasks
* 3c4f88430679 UPSTREAM: ext4: refuse to create ea block when umounted
* 0473082f7ad7 UPSTREAM: ext4: optimize ea_inode block expansion
* bf0b8e8181b0 UPSTREAM: ext4: allocate extended attribute value in vmalloc area
* 79bd2581b8cd ANDROID: ABI: Update the GKI symbol list and ABI XML
* cfe5bd7f0163 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* f3091267aca0 ANDROID: GKI: update xiaomi symbol list
* fb1db47637a3 UPSTREAM: Partially revert "perf/arm-cmn: Optimise DTC counter accesses"
* 1f12217e5de2 UPSTREAM: usb: dwc3: gadget: Ignore End Transfer delay on teardown
* fc41b9e12227 UPSTREAM: elfcore: Add a cprm parameter to elf_core_extra_{phdrs,data_size}
* ee863e210983 UPSTREAM: arm64: mte: Fix double-freeing of the temporary tag storage during coredump
* 7dc85abaac28 UPSTREAM: wifi: nl80211: Add checks for nla_nest_start() in nl80211_send_iface()
* 8b1316dd5b16 UPSTREAM: mm/page_exit: fix kernel doc warning in page_ext_put()
* 37fbaa232deb UPSTREAM: f2fs: fix gc mode when gc_urgent_high_remaining is 1
* ad8cc978ccc1 BACKPORT: mm: multi-gen LRU: move lru_gen_add_mm() out of IRQ-off region
* 73d24f728f3f UPSTREAM: KVM: arm64: Use correct accessor to parse stage-1 PTEs
* 2f6641fde7e3 UPSTREAM: wifi: fix multi-link element subelement iteration
* 0cc04953f0c0 UPSTREAM: perf/arm-cmn: Add more bits to child node address offset field
* a481cc4587ce UPSTREAM: perf/arm-cmn: Update watchpoint format
* 668c43092bbd UPSTREAM: perf/arm-cmn: Hide XP PUB events for CMN-600
* 5761541a4eb5 BACKPORT: wifi: cfg80211: move puncturing bitmap validation from mac80211
* 267de69e07c3 UPSTREAM: wifi: nl80211: add MLO_LINK_ID to CMD_STOP_AP event
* 83e77c318322 BACKPORT: cfg80211: Update Transition Disable policy during port authorization
* f4559cb66624 ANDROID: ABI: Update db845c symbol list on ufshcd
* bef41f506fe2 ANDROID: usb: gadget: f_accessory: update to usb_gstrings_attach
* 0fd1c2a78d14 UPSTREAM: usb: gadget: composite: Draw 100mA current if not configured
* a223191ed9f6 UPSTREAM: usb: dwc3: gadget: Change condition for processing suspend event
* 91c677412ca9 UPSTREAM: net/sched: tcindex: update imperfect hash filters respecting rcu
* 6ca9fd3a0ceb BACKPORT: FROMGIT: scsi: ufs: core: Add hibernation callbacks
* 35d26a773653 ANDROID: ABI: Update unisoc thermal symbol list
* 683fe954dc18 ANDROID: thermal: Add a vendor hook for thermal throttle update
* e013dc708169 ANDROID: GKI: Add symbol list for Lenovo
* 6a7aa0901366 ANDROID: Enable percpu high priority kthreads for erofs
* 40a9ba963b1a UPSTREAM: erofs: fix an error code in z_erofs_init_zip_subsystem()
* 7dc188b2220b BACKPORT: erofs: add per-cpu threads for decompression as an option
* 4fd62a87f5da ANDROID: ABI: Update oplus symbol list
* 05b5ff11ad98 ANDROID: vendor_hooks: Add hooks for mutex and rwsem optimistic spin
* 9eec95bb4b41 UPSTREAM: io_uring: ensure that io_init_req() passes in the right issue_flags
* c112dc57713a ANDROID: Update the GKI symbol list and ABI XML
* bdf1c2ccdf1b UPSTREAM: io_uring: add missing lock in io_get_file_fixed
* 3352886cae4c ANDROID: gki_config: enable CONFIG_IIO_TRIGGERED_BUFFER
* e21e3d108bcd ANDROID: GKI: VIVO: Add a symbol to symbol list
* 5239ef3d19d8 UPSTREAM: drivers/thermal/cpufreq_cooling: Use private callback ops for each cooling device
* 287c9980a085 UPSTREAM: scsi: scsi_debug: Fix possible UAF in sdebug_add_host_helper()
* 6db5181a3f4a UPSTREAM: io_uring/rw: remove leftover debug statement
* 4390be5c797f UPSTREAM: io_uring/rw: ensure kiocb_end_write() is always called
* 6b3d1f961dc1 UPSTREAM: io_uring: fix double poll leak on repolling
* 3749f8d82684 UPSTREAM: io_uring: Clean up a false-positive warning from GCC 9.3.0
* 0da7ee3fbe46 UPSTREAM: io_uring/net: fix fast_iov assignment in io_setup_async_msg()
* 3a4f67f90391 UPSTREAM: io_uring: io_kiocb_update_pos() should not touch file for non -1 offset
* 3c83e0a95a36 UPSTREAM: io_uring/rw: defer fsnotify calls to task context
* 630c3722197a UPSTREAM: io_uring: do not recalculate ppos unnecessarily
* 47179f7dd8dd UPSTREAM: io_uring: update kiocb->ki_pos at execution time
* b0b3d93abc78 UPSTREAM: io_uring: remove duplicated calls to io_kiocb_ppos
* 7b865f60c7cf UPSTREAM: io_uring: ensure that cached task references are always put on exit
* c72cbb2252e5 UPSTREAM: io_uring: fix async accept on O_NONBLOCK sockets
* 88be697dc064 UPSTREAM: io_uring: allow re-poll if we made progress
* 393d994594b2 UPSTREAM: io_uring: support MSG_WAITALL for IORING_OP_SEND(MSG)
* 8f3a4070fd3b UPSTREAM: io_uring: add flag for disabling provided buffer recycling
* b0b6bfe44398 UPSTREAM: io_uring: ensure recv and recvmsg handle MSG_WAITALL correctly
* 40520bb96c93 UPSTREAM: io_uring: improve send/recv error handling
* 6c0dd68dbe1f UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
* ab6956ac6b34 UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
* b4ab4ac9009d UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
* 2373a0c72f46 UPSTREAM: io_uring: don't gate task_work run on TIF_NOTIFY_SIGNAL
* b579578d93d5 UPSTREAM: io_uring/io-wq: only free worker if it was allocated for creation
* 19758f54f74d UPSTREAM: io_uring/io-wq: free worker if task_work creation is canceled
* 65e1f2ef67cc UPSTREAM: io_uring: lock overflowing for IOPOLL
* 198e5002e262 UPSTREAM: io_uring: Fix unsigned 'res' comparison with zero in io_fixup_rw_res()
* 5af453ff63c3 UPSTREAM: io_uring: fix CQ waiting timeout handling
* e6f9c1b71a5d UPSTREAM: io_uring: check for valid register opcode earlier
* dcc1ea1639be UPSTREAM: io_uring: Fix a null-ptr-deref in io_tctx_exit_cb()
* 3a1c153b9654 UPSTREAM: io_uring: move to separate directory
* c0dee081116f UPSTREAM: io_uring/poll: fix poll_refs race with cancelation
* 5a5dcf5c1d8c UPSTREAM: io_uring: make poll refs more robust
* 30909f865bd6 UPSTREAM: io_uring: cmpxchg for poll arm refs release
* 242ed498525d UPSTREAM: io_uring: fix tw losing poll events
* 7e603b207928 UPSTREAM: io_uring: update res mask in io_poll_check_events
* fab4d02938f3 UPSTREAM: wifi: cfg80211: Extend cfg80211_update_owe_info_event() for MLD AP
* 048ad5d37537 UPSTREAM: wifi: cfg80211: Extend cfg80211_new_sta() for MLD AP
* 9216110fdfd5 UPSTREAM: wifi: cfg80211: Authentication offload to user space for MLO connection in STA mode
* 272c5a9d376c UPSTREAM: wifi: cfg80211: trace: remove MAC_PR_{FMT,ARG}
* 99da8df3761f UPSTREAM: KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS
* 16bb33d7efcf ANDROID: ABI: Update allowed list for QCOM
* 3383d21e9e60 UPSTREAM: wifi: cfg80211: Support 32 bytes KCK key in GTK rekey offload
* 26bac3f09374 ANDROID: MGLRU: Don't skip anon reclaim if swap low
* 151bc216581f ANDROID: incremental fs: Move throttling to outside page lock
* 3ab6fda925b5 ANDROID: incremental fs: Fix race between truncate and write last block
* aba5f5754be4 ANDROID: fuse-bpf: Do not change bpf program in lookups
* dd72bb259fa9 UPSTREAM: usb: gadget: u_serial: Add null pointer check in gserial_resume
* a2ee0d8df380 UPSTREAM: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
* 9cdb4e5812fa UPSTREAM: binder: Address corner cases in deferred copy and fixup
* 884fec935c51 UPSTREAM: binder: fix pointer cast warning
* 0502554803f0 UPSTREAM: binder: defer copies of pre-patched txn data
* a9afae9aa409 UPSTREAM: binder: read pre-translated fds from sender buffer
* 7887b13e6be4 UPSTREAM: net_sched: reject TCF_EM_SIMPLE case for complex ematch module
* 89eccb84959f UPSTREAM: ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop
* fda78dabcaec Revert "ANDROID: GKI: Add vendor hook to binder transaction"
* c404b74d5f1e ANDROID: GKI: Update the ABI xml representation for fuse-bpf
* 7a1cca7dbd8e ANDROID: fuse-bpf: Add /sys/fs flags for fuse-bpf version
* f5f4199c102a ANDROID: fuse-bpf v1.1
* bff9debefdec ANDROID: GKI: update xiaomi symbol list
* 5a6502af1102 ANDROID: psi: Add vendor hooks for PSI tracing
* af8dfb011fd0 FROMLIST: input: Add KEY_CAMERA_FOCUS event in HID
* 79b3761c89ae BACKPORT: sched/core: Fix use-after-free bug in dup_user_cpus_ptr()
* a838fd5d0888 Revert "FROMGIT: sched: Add __releases annotations to affine_move_task()"
* 5767bdca07c5 Revert "BACKPORT: FROMGIT: sched: Introduce affinity_context"
* 158d54a8a831 Revert "BACKPORT: FROMGIT: sched: Always preserve the user requested cpumask"
* 92bd55bc5225 Revert "FROMLIST: sched: Fix use-after-free bug in dup_user_cpus_ptr()"
* bd82038474ec Revert "BACKPORT: FROMGIT: sched: Enforce user requested affinity"
* 0f54a1c923a1 Revert "FROMGIT: sched: Always clear user_cpus_ptr in do_set_cpus_allowed()"
* 97c7d8de1ddf Revert "ANDROID: sched: Keep sched_class::set_cpus_allowed stable"
* 4ef9aa1b493e Revert "ANDROID: sched: Move scratch_mask to a percpu variable"
* aa272796660e BACKPORT: of: reserved_mem: Have kmemleak ignore dynamically allocated reserved mem
* 20c1f0a6d2c6 Revert "BACKPORT: FROMGIT: mm/cma.c: make kmemleak aware of all CMA regions"
* 5862eafd8ef7 Revert "FROMGIT: mm/cma.c: delete kmemleak objects when freeing CMA areas to buddy at boot"
* 5c6418ddee6c Revert "UPSTREAM: mm: kmemleak: alloc gray object for reserved region with direct map"
* 45a51d2eb8c7 ANDROID: GKI: Update symbol list for Amlogic
* d41e54aefb92 ANDROID: GKI: Add symbol list for ZEKU
* 32d4e80df4cb ANDROID: dm-bow: Add ABI documentation
* 88e27b17aab6 ANDROID: dm-bow: Fix 5.15 compatibility issue
* 63a1e5f1d07a Revert "ANDROID: dm-bow: remove dm-bow"
* d07a013cd06f ANDROID: vendor_hook: fix the error record of rwsem
* 5fcf93b31647 ANDROID: ABI: Update allowed list for QCOM
* 16e7178e5875 ANDROID: GKI: Update abi_gki_aarch64_qcom symbols
* 4ef0a7dff1c4 ANDROID: crypto: testmgr - add back deleted hctr2 test vectors
* 2cde0330aa31 ANDROID: abi_gki_aarch64_qcom: Add rpmsg_rx_done and zap_vma_ptes
* 810133cb61fe ANDROID: cpuidle-psci: Fix suspicious RCU usage
* 6f810b08ef10 FROMGIT: usb: gadget: configfs: Restrict symlink creation is UDC already binded
* 9dff37ba7b7e ANDROID: Update symbol list for sunxi
* 18eaf71786cf FROMGIT: scsi: ufs: Try harder to change the power mode
* cfc314cd6f03 UPSTREAM: scsi: ufs: Reduce the START STOP UNIT timeout
* 6a9193a0ff96 UPSTREAM: 9p/fd: fix issue of list_del corruption in p9_fd_cancel()
* b4c3ac472028 UPSTREAM: fs: do not update freeing inode i_io_list
* b607fae9000f UPSTREAM: f2fs: fix to invalidate dcc->f2fs_issue_discard in error path
* 0b34c91b8367 FROMGIT: wifi: cfg80211: Fix extended KCK key length check in nl80211_set_rekey_data()
* f719d33f1144 UPSTREAM: iommu/iova: Fix alloc iova overflows issue
* 43c604d36ef2 UPSTREAM: iommu: Avoid races around device probe
* 613751d732f4 ANDROID: GKI: Update abi_gki_aarch64_pasa
* 2f7c6eb5876b ANDROID: softirq: Refine RT defer softirq
* 286300ece413 UPSTREAM: wifi: wilc1000: validate number of channels
* 7594f016edaf UPSTREAM: wifi: wilc1000: validate pairwise and authentication suite offsets
* d9a54ce812bf UPSTREAM: wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_OPER_CHANNEL attribute
* 0be098594735 UPSTREAM: media: dvb-core: Fix UAF due to refcount races at releasing
* e5905d8ab396 ANDROID: Update the GKI symbol list and ABI XML
* 984241bdc04f UPSTREAM: efi: rt-wrapper: Add missing include
* ec6fe823507b UPSTREAM: arm64: efi: Execute runtime services from a dedicated stack
* 003dacfcee54 UPSTREAM: KVM: x86/mmu: Fix race condition in direct_page_fault
* 19987d1e7fee UPSTREAM: usb: gadget: uvc: Rename bmInterfaceFlags -> bmInterlaceFlags
* 6d2ec81c11aa ANDROID: GKI: KASAN: disable INLINE
* ae0a1eb8308a ANDROID: GKI: Update symbol list for mtk
* 9a8dcea6abcf ANDROID: usb: f_accessory: Check buffer size when initialised via composite
* 2a298e88eb2c UPSTREAM: drm/shmem-helper: Avoid vm_open error paths
* 2c76d2b9c5d2 UPSTREAM: proc: avoid integer type confusion in get_proc_long
* cc6c5c7fa237 UPSTREAM: ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
* 0861407d6e2d UPSTREAM: proc: proc_skip_spaces() shouldn't think it is working on C strings
* 3cf30601b034 UPSTREAM: usb: gadget: f_hid: fix f_hidg lifetime vs cdev
* 8864b0342f70 UPSTREAM: nfp: fix use-after-free in area_cache_get()
* 9563d286197b FROMGIT: scsi: ufs: Modify Tactive time setting conditions
* afe869b80a61 ANDROID: gki_defconfig: disable various x86 and hw flags
* 4dc28fe92869 UPSTREAM: usb: gadget: f_fs: Fix unbalanced spinlock in __ffs_ep0_queue_wait

.xml file is updated due to new symbols being now tracked:

76 function symbol(s) added
  'u64 __blkg_prfill_rwstat(struct seq_file*, struct blkg_policy_data*, const struct blkg_rwstat_sample*)'
  'u64 __blkg_prfill_u64(struct seq_file*, struct blkg_policy_data*, u64)'
  'void __free_iova(struct iova_domain*, struct iova*)'
  'int __traceiter_android_vh_modify_thermal_throttle_update(void*, struct thermal_zone_device*, bool*)'
  'int __traceiter_android_vh_mpam_set(void*, struct task_struct*, struct task_struct*)'
  'int __traceiter_android_vh_mutex_can_spin_on_owner(void*, struct mutex*, int*)'
  'int __traceiter_android_vh_mutex_opt_spin_finish(void*, struct mutex*, bool)'
  'int __traceiter_android_vh_mutex_opt_spin_start(void*, struct mutex*, bool*, int*)'
  'int __traceiter_android_vh_psi_group(void*, struct psi_group*)'
  'int __traceiter_android_vh_rwsem_can_spin_on_owner(void*, struct rw_semaphore*, bool*)'
  'int __traceiter_android_vh_rwsem_opt_spin_finish(void*, struct rw_semaphore*, bool)'
  'int __traceiter_android_vh_rwsem_opt_spin_start(void*, struct rw_semaphore*, bool*, int*, bool)'
  'int __traceiter_wbc_writepage(void*, struct writeback_control*, struct backing_dev_info*)'
  'struct iova* alloc_iova(struct iova_domain*, unsigned long int, unsigned long int, bool)'
  'const char* bdi_dev_name(struct backing_dev_info*)'
  'void blkcg_print_blkgs(struct seq_file*, struct blkcg*, u64(*)(struct seq_file*, struct blkg_policy_data*, int), const struct blkcg_policy*, int, bool)'
  'void blkg_conf_finish(struct blkg_conf_ctx*)'
  'int blkg_conf_prep(struct blkcg*, const struct blkcg_policy*, char*, struct blkg_conf_ctx*)'
  'u64 blkg_prfill_rwstat(struct seq_file*, struct blkg_policy_data*, int)'
  'void blkg_rwstat_exit(struct blkg_rwstat*)'
  'int blkg_rwstat_init(struct blkg_rwstat*, gfp_t)'
  'void blkg_rwstat_recursive_sum(struct blkcg_gq*, struct blkcg_policy*, int, struct blkg_rwstat_sample*)'
  'u64 clockevent_delta2ns(unsigned long int, struct clock_event_device*)'
  'void clockevents_register_device(struct clock_event_device*)'
  'int crypto_authenc_extractkeys(struct crypto_authenc_keys*, const u8*, unsigned int)'
  'struct dentry* d_alloc_name(struct dentry*, const char*)'
  'void* devm_pci_remap_cfg_resource(struct device*, struct resource*)'
  'void* devm_pci_remap_cfgspace(struct device*, resource_size_t, resource_size_t)'
  'void devm_release_resource(struct device*, struct resource*)'
  'int divider_determine_rate(struct clk_hw*, struct clk_rate_request*, const struct clk_div_table*, u8, unsigned long int)'
  'struct iova* find_iova(struct iova_domain*, unsigned long int)'
  'struct file_system_type* get_fs_type(const char*)'
  'unsigned int get_next_ino()'
  'int get_tree_single(struct fs_context*, int(*)(struct super_block*, struct fs_context*))'
  'struct iio_channel* iio_channel_get_all(struct device*)'
  'void iio_channel_release_all(struct iio_channel*)'
  'struct iio_buffer* iio_kfifo_allocate()'
  'ssize_t iio_read_const_attr(struct device*, struct device_attribute*, char*)'
  'irqreturn_t iio_trigger_generic_data_rdy_poll(int, void*)'
  'void iio_triggered_buffer_cleanup(struct iio_dev*)'
  'int iio_triggered_buffer_setup_ext(struct iio_dev*, irqreturn_t(*)(int, void*), irqreturn_t(*)(int, void*), const struct iio_buffer_setup_ops*, const struct attribute**)'
  'int iio_update_buffers(struct iio_dev*, struct iio_buffer*, struct iio_buffer*)'
  'bool iio_validate_scan_mask_onehot(struct iio_dev*, const unsigned long int*)'
  'bool input_device_enabled(struct input_dev*)'
  'void input_set_poll_interval(struct input_dev*, unsigned int)'
  'int input_setup_polling(struct input_dev*, void(*)(struct input_dev*))'
  'struct io_cq* ioc_lookup_icq(struct io_context*, struct request_queue*)'
  'int iova_cache_get()'
  'void iova_cache_put()'
  'void irq_domain_associate_many(struct irq_domain*, unsigned int, irq_hw_number_t, int)'
  'void iterate_supers_type(struct file_system_type*, void(*)(struct super_block*, void*), void*)'
  'void kill_litter_super(struct super_block*)'
  'int mmc_set_blocklen(struct mmc_card*, unsigned int)'
  'int netdev_set_num_tc(struct net_device*, u8)'
  'int netdev_set_tc_queue(struct net_device*, u8, u16, u16)'
  'struct net_device* netdev_upper_get_next_dev_rcu(struct net_device*, struct list_head**)'
  'unsigned long int nr_free_buffer_pages()'
  'int of_pci_get_max_link_speed(struct device_node*)'
  'bool pci_ats_supported(struct pci_dev*)'
  'void pci_disable_ats(struct pci_dev*)'
  'int pci_enable_ats(struct pci_dev*, int)'
  'int rpmsg_rx_done(struct rpmsg_endpoint*, void*)'
  'int scsi_register_driver(struct device_driver*)'
  'void sdhci_adma_write_desc(struct sdhci_host*, void**, dma_addr_t, int, unsigned int)'
  'void sdhci_set_uhs_signaling(struct sdhci_host*, unsigned int)'
  'size_t sg_copy_buffer(struct scatterlist*, unsigned int, void*, size_t, off_t, bool)'
  'size_t sg_zero_buffer(struct scatterlist*, unsigned int, size_t, off_t)'
  'int simple_statfs(struct dentry*, struct kstatfs*)'
  'int sysfs_create_mount_point(struct kobject*, const char*)'
  'void sysfs_remove_mount_point(struct kobject*, const char*)'
  'unsigned char tty_get_char_size(unsigned int)'
  'int ufshcd_system_freeze(struct device*)'
  'int ufshcd_system_restore(struct device*)'
  'int ufshcd_system_thaw(struct device*)'
  'int usbnet_get_ethernet_addr(struct usbnet*, int)'
  'void zap_vma_ptes(struct vm_area_struct*, unsigned long int, unsigned long int)'

16 variable symbol(s) added
  'struct tracepoint __tracepoint_android_vh_modify_thermal_throttle_update'
  'struct tracepoint __tracepoint_android_vh_mpam_set'
  'struct tracepoint __tracepoint_android_vh_mutex_can_spin_on_owner'
  'struct tracepoint __tracepoint_android_vh_mutex_opt_spin_finish'
  'struct tracepoint __tracepoint_android_vh_mutex_opt_spin_start'
  'struct tracepoint __tracepoint_android_vh_psi_group'
  'struct tracepoint __tracepoint_android_vh_rwsem_can_spin_on_owner'
  'struct tracepoint __tracepoint_android_vh_rwsem_opt_spin_finish'
  'struct tracepoint __tracepoint_android_vh_rwsem_opt_spin_start'
  'struct tracepoint __tracepoint_wbc_writepage'
  'struct static_key_true io_cgrp_subsys_on_dfl_key'
  'const unsigned char pcie_link_speed[16]'
  'unsigned long int phy_basic_features[2]'
  'unsigned long int phy_gbit_features[2]'
  'const struct inode_operations simple_dir_inode_operations'
  'const struct file_operations simple_dir_operations'

type 'enum bpf_prog_type' changed
  enumerator 'BPF_PROG_TYPE_FUSE' (32) was added

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