Commit 42f48afb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



Sync up with android13-5.10 for the following commits:

800870b6 ANDROID: Update the ABI representation
b6a23be1 ANDROID: Fix for kernelci !CONFIG_SMP break-breaks
9bc66fe5 ANDROID: fuse-bpf: set error_in to ENOENT in negative lookup
92fc848e ANDROID: fuse-bpf: Add ability to run ranges of tests to fuse_test
cd991428 BACKPORT: NFC: netlink: fix sleep in atomic bug when firmware download timeout
e56825d0 ANDROID: KVM: arm64: Initialize ptr auth in protected mode
ab9c5214 ANDROID: cgroup: Add vendor hook for rebuild_root_domains_bypass
8015dd49 FROMGIT: KVM: arm64: Ignore kvm-arm.mode if !is_hyp_mode_available()
5495c19c ANDROID: Update the ABI symbol list and xml
9c24cb87 UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie
80c59100 UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast
9fafd34f UPSTREAM: wifi: mac80211_hwsim: fix race condition in pending packet
d91e7b80 ANDROID: Update the ABI representation
14e10283 ANDROID: sched: Fix off-by-one with cpupri MAX_RT_PRIO evaluation
7a6ea55a Revert "ANDROID: workqueue: add vendor hook for wq lockup information"
7b19b006 UPSTREAM: kernel/irq: export irq_gc_set_wake
1856a689 ANDROID: Update the ABI representation
1bd53447 ANDROID: fuse-bpf: Add test for lookup postfilter
494e7075 ANDROID: fuse-bpf: readddir postfilter fixes
8483cc3a ANDROID: Enable BUILD_GKI_CERTIFICATION_TOOLS for x86_64 GKI
f8136944 ANDROID: force struct cgroup_taskset to be defined in KMI
3dc6e416 ANDROID: force struct blk_mq_alloc_data to be defined in KMI
af4d4153 BACKPORT: erofs: fix use-after-free of on-stack io[]
aec8f79a ANDROID: GKI: db845c: Update symbols list and ABI
7b87b9dd ANDROID: kleaf: Explicit list of ABI files.
d25aa0db FROMLIST: f2fs: let FI_OPU_WRITE override FADVISE_COLD_BIT
5625e355 ANDROID: incfs: Add check for ATTR_KILL_SUID and ATTR_MODE in incfs_setattr
0cf7d9ce Revert "UPSTREAM: scsi: ufs: core: Reduce the power mode change timeout"
1d61c5b5 Revert "FROMLIST: scsi: ufs: Fix deadlocks between power management and error handler"
dd18c291 BACKPORT: UPSTREAM: kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}
f68d040c FROMLIST: scsi: ufs: Fix deadlocks between power management and error handler
32934b54 UPSTREAM: ASoC: hdmi-codec: make hdmi_codec_controls static
46a21348 UPSTREAM: ASoC: hdmi-codec: Add a prepare hook
21e97dfa UPSTREAM: ASoC: hdmi-codec: Add iec958 controls
9e9d2669 UPSTREAM: ASoC: hdmi-codec: Rework to support more controls
8de9ae86 UPSTREAM: ALSA: iec958: Split status creation and fill
92c20970 UPSTREAM: ALSA: doc: Clarify IEC958 controls iface
6cc06d03 UPSTREAM: ASoC: hdmi-codec: remove unused spk_mask member
004a44b9 UPSTREAM: ASoC: hdmi-codec: remove useless initialization
a7633aa2 UPSTREAM: ASoC: codec: hdmi-codec: Support IEC958 encoded PCM format
c584eb99 UPSTREAM: ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack()
f5a1cb7f UPSTREAM: ASoC: hdmi-codec: Add RX support
6140082c UPSTREAM: ASoC: hdmi-codec: Get ELD in before reporting plugged event
185f60f2 ANDROID: add forward declaration vm_unmapped_area_info
d1b29856 ANDROID: net: export symbol for tracepoint_consume_skb
952141fb BACKPORT: dm verity: set DM_TARGET_IMMUTABLE feature flag
b5fe8c47 BACKPORT: pipe: Fix missing lock in pipe_resize_ring()
790fa51f BACKPORT: KVM: x86: avoid calling x86 emulator without a decoded instruction
ee742bcc ANDROID: power: fix vendor hook in suspend.c
7108d9d0 ANDROID: remove inclusions from hook definition headers
d6ab8e3b Revert "ANDROID: arm64: smp: fix Lockdep warning: RCU used illegally from idle CPU."
aa381a5c ANDROID: remove CONFIG_TRACEPOINTS from hook definition headers
aff23090 BACKPORT: watchqueue: make sure to serialize 'wqueue->defunct' properly
66047fb4 ANDROID: Update the ABI representation
d451b4ee ANDROID: Update the ABI representation
3d35c6b9 UPSTREAM: scsi: ufs: core: Reduce the power mode change timeout
5c6d73ac BACKPORT: scsi: ufs: core: Increase fDeviceInit poll frequency
22089088 FROMGIT: f2fs: increase the limit for reserve_root
7af4b3ca FROMGIT: f2fs: complete checkpoints during remount
7a046711 FROMGIT: f2fs: flush pending checkpoints when freezing super
f18d4036 FROMGIT: f2fs: remove gc_urgent_high_limited for cleanup
68f703b1 FROMGIT: f2fs: fix wrong continue condition in GC
8ecc3b8d BACKPORT: f2fs: handle decompress only post processing in softirq
23d66477 BACKPORT: f2fs: introduce memory mode
1dd8074b ANDROID: Update the ABI representation
9bc5a118 Revert "ANDROID: usb: host: export additional xhci symbols for ring management"
3743e365 Revert "ANDROID: GKI: signal: Export for __lock_task_sighand"
7219ca32 Revert "ANDROID: Sched: Add restricted vendor hooks for scheduler"
4e709a85 ANDROID: fix kernelci issue for allnoconfig builds
909d582d ANDROID: sched: Introducing PELT multiplier
9cfe2646 Revert "ANDROID: vendor_hooks: FPSIMD save/restore by using vendor_hooks"
c7afbeb1 Revert "ANDROID: mm: export zone_watermark_ok"
e09aff60 ANDROID: softirq: Add EXPORT_SYMBOL_GPL for softirq and tasklet
dd04e189 ANDROID: Update the ABI representation
e3b7e41f ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.
b5bf2997 FROMLIST: xfrm: Ensure policy checked for nested ESP tunnels
970e0266 FROMLIST: xfrm: Skip checking of already-verified secpath entries
039f38f9 Revert "ANDROID: mm: add vendor hook for vmpressure"
fc6f47b6 Revert "ANDROID: module: Add vendor hook"
f509b285 ANDROID: Update the ABI representation
b8762fa2 BACKPORT: mm: don't be stuck to rmap lock on reclaim path
737a5314 ANDROID: power: Add vendor hook for suspend
19b9be6d ANDROID: vendor_hooks:vendor hook for mmput
4a84a59c ANDROID: vendor_hooks:vendor hook for pidfd_open
571f9fff ANDROID: Update the ABI representation
a48ad117 BACKPORT: f2fs: do not set compression bit if kernel doesn't support
406e9b3d BACKPORT: f2fs: do not count ENOENT for error case
0d59b257 BACKPORT: f2fs: avoid infinite loop to flush node pages
6d2d344c BACKPORT: f2fs: replace congestion_wait() calls with io_schedule_timeout()
ffe2cbbf BACKPORT: f2fs: fix wrong condition check when failing metapage read
9f4fae40 UPSTREAM: arm64: perf: Support new DT compatibles
be08fd28 UPSTREAM: arm64: perf: Simplify registration boilerplate
96dc76e1 UPSTREAM: arm64: perf: Support Denver and Carmel PMUs
5ac3e909 UPSTREAM: arm64: perf: add support for Cortex-A78
913113f0 UPSTREAM: binder: fix redefinition of seq_file attributes
0c79c408 BACKPORT: drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu
0a21a3eb BACKPORT: usb: gadget: rndis: prevent integer overflow in rndis_set_response()
d9d8680e BACKPORT: KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID
2f9fed9c BACKPORT: Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
bc80ea8a BACKPORT: io_uring: always grab file table for deferred statx
0380da7f FROMGIT: io_uring: Use original task for req identity in io_identity_cow()
19bb609b FROMLIST: binder: fix UAF of ref->proc caused by race condition
99997609 ANDROID: binder: fix pending prio state for early exit
b5a6bcf9 ANDROID: Remove all but top-level OWNERS
254dfc7e ANDROID: Update the ABI representation
feb89f38 ANDROID: fix kernelci error in fs/fuse/dir.c
3821e5b2 ANDROID: power: add a vendor hook to log unfrozen tasks
f2cf5332 ANDROID: fuse-bpf: Fix RCU/reference issue
1f44e441 UPSTREAM: exfat: reduce block requests when zeroing a cluster
885349f5 FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
eb434420 FROMLIST: scsi: ufs: Fix a race condition related to device management commands
561c2707 ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup
a6b9536c ANDROID: KVM: arm64: Increase size of FF-A buffer
094905c8 ANDROID: fuse-bpf: Always call revalidate for backing
a8b1cff5 ANDROID: fuse-bpf: Adjust backing handle funcs
a06f77a0 ANDROID: fuse-bpf: Fix revalidate error path and backing handling
329650e3 ANDROID: fuse: Don't use readdirplus w/ nodeid 0
55f267ee ANDROID: fuse-bpf: Fix use of get_fuse_inode
81a1ae6b ANDROID: mm: unlock the page on speculative fault retry
2957657a ANDROID: power: Add vendor hook for suspend
ace01eaf FROMGIT: Binder: add TF_UPDATE_TXN to replace outdated txn
f6acdedf ANDROID: GKI: forward declare struct tcpci_data in vendor hooks
037c2b81 ANDROID: Fix warning for undeclared struct acr_info
825e1059 ANDROID: KVM: arm64: Free shadow data vCPUs memcache

And track more new symbols that were added to the 'android13-5.10' branch:

25 symbol(s) added
  'GKI_struct_blk_mq_alloc_data'
  'GKI_struct_cgroup_taskset'
  '__bitmap_xor'
  '__traceiter_android_vh_early_resume_begin'
  '__traceiter_android_vh_resume_end'
  '__traceiter_android_vh_try_to_freeze_todo_logging'
  '__tracepoint_android_vh_early_resume_begin'
  '__tracepoint_android_vh_resume_end'
  '__tracepoint_android_vh_try_to_freeze_todo_logging'
  '__xa_insert'
  'dev_base_lock'
  'devm_fwnode_gpiod_get_index'
  'devm_gpiod_get_array_optional'
  'drm_atomic_bridge_chain_disable'
  'drm_mode_parse_command_line_for_connector'
  'init_user_ns'
  'iommu_dma_enable_best_fit_algo'
  'kobject_rename'
  'nf_register_net_hooks'
  'nf_unregister_net_hooks'
  'ns_capable_noaudit'
  'regulator_set_active_discharge_regmap'
  'snd_pcm_create_iec958_consumer_default'
  'snd_pcm_fill_iec958_consumer'
  'snd_pcm_fill_iec958_consumer_hw_params'

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifb26d1c3de6f1ad3c3e6afc37d8acd61bdd8ac14
parents a5e69085 800870b6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment