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

!5031 Backport 5.10.196 -5.10.197 LTS patches from upstream

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

Conflicts:

Already merged(4):
c56095812721  perf jevents: Make build dependency on test JSONs
8db844077ec9  net/sched: Retire rsvp classifier
2cdcf6481cb3  mm/filemap: fix infinite loop in generic_file_buffered_read()
242c5740dd17  ext4: fix rec_len verify error


Rejected(6):
2cc1f4986233  Revert "configfs: fix a race in configfs_lookup()"
dc01bfdc3d91  perf/smmuv3: Enable HiSilicon Erratum 162001900 quirk for HIP08/09
4bff1d95ba62  ext2: fix datatype of block number in ext2_xattr_set2()
e16f5f8cab65  perf tools: Add an option to build without libbfd
0c5d5f8e0d2b  proc: fix a dentry lock race between release_task and lookup
3753e568d67f  ata: libata: disallow dev-initiated LPM transitions to unsupported states

Total patches: 79 - 4 - 6 = 69 
 
Link:https://gitee.com/openeuler/kernel/pulls/5031

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2915e243 ef3a7cd2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment