Unverified Commit ace32245 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2465 Backport 5.10.177 LTS patches from upstream

Merge Pull Request from: @sanglipeng 
 
issue:https://gitee.com/openeuler/kernel/issues/I88YNP

Backport 5.10.177 LTS patches from upstream.

Conflicts:

context conflict(2):  
7958663668ef: KVM: Pre-allocate cpumasks for kvm_make_all_cpus_request_except()
18359b8e30c4: power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Already merged(14):
2b346876b931: power: supply: bq24190: Fix use after free bug in bq24190_remove due to race condition
75e2144291e8: power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition
bfeeb3aaad4e: xirc2ps_cs: Fix use after free bug in xirc2ps_detach
ddcf83200036: perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output
1fde5782f187: net: tls: fix possible race condition between do_tls_getsockopt_conf() and do_tls_setsockopt_conf()
c09cdf6eb815: scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate()
cb5879efde4f: net: qcom/emac: Fix use after free bug in emac_remove due to race condition
aae6d1bf4d8e: dm thin: fix deadlock when swapping to thin device
1eaa2b7ae90c: i2c: xgene-slimpro: Fix out-of-bounds bug in xgene_slimpro_i2c_xfer()
c68f08cc7456: dm stats: check for and propagate alloc_percpu failure
66ff37993dd7: dm crypt: add cond_resched() to dmcrypt_write()
cb61e1e36fb3: xfs: shut down the filesystem if we screw up quota reservation
a6d345c3a31e: xfs: don't reuse busy extents on extent trim
5f6347034341: btrfs: fix race between quota disable and quota assign ioctls

Rejected(2):
18dd825b8651: perf: fix perf_event_context->time
3392d67af0a4: ext4: fix kernel BUG in 'ext4_write_inline_data_end()

Kabi broken(1):
d04dac7fae75: net: mdio: fix owner field for mdio buses registered using device-tree

Total patches: 172 - 14 - 2 -1 = 155 
 
Link:https://gitee.com/openeuler/kernel/pulls/2465

 

Reviewed-by: default avatarzhao xiaoqiang <zhaoxiaoqiang11@jd.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 65c1f15a bebe723b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment