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

!2938 Backport 5.10.183 - 5.10.184 LTS patches from upstream

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


Conflicts:

Already merged(8):
7c5c67aa29444: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
01c3d30649759: nbd: Fix debugfs_create_dir error checking
eb37fef417a24: media: ttusb-dec: fix memory leak in ttusb_dec_exit_dvb()
ae7e941f4dc35: net: sched: fix NULL pointer dereference in mq_attach
d03d31d3a2060: gfs2: Don't deref jdesc in evict
2ea7d26ed851d: media: dvb-core: Fix use-after-free due on race condition at dvb_net
ca2d171fd1f3e: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
76169f7490899: media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221

Rejected(4):
0dcf021af4cb3: ALSA: hda: Glenfly: add HD Audio PCI IDs and HDMI Codec Vendor IDs.
a2cd7599b558d: scsi: dpt_i2o: Remove broken pass-through ioctl (I2OUSERCMD)
d21a20f4421db: scsi: dpt_i2o: Do not process completions with invalid addresses
0e98a97f772f2: xfs: verify buffer contents when we skip log replay

Kabi broken(2):
cccc6209708f5: tcp: deny tcp_disconnect() when threads are waiting
9fcc3c3d26a04: neighbour: fix unaligned access to pneigh_entry

Config broken(2):
842156dc0aad5: ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
6d6612f7f9768: drm/rcar: stop using 'imply' for dependencies

Total patches: 188 - 8 - 4 - 2 - 2 = 172 
 
Link:https://gitee.com/openeuler/kernel/pulls/2938

 

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