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

Merge android12-5.10 into android12-5.10-lts



This merges the android12-5.10 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 29bf3aa7 Merge tag 'android12-5.10.239_r00' into android12-5.10
* f0ab6d6c UPSTREAM: f2fs: compress: fix error path of inc_valid_block_count()
* 449b3695 BACKPORT: f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode
* a40d88b6 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

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