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

!5711 Backport 5.10.201 LTS patches from upstream 

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

Conflicts:
Already merged(5):
7b063c93bece  drm/radeon: possible buffer overflow
02db438311f8  crypto: hisilicon/hpre - Fix a erroneous check after snprintf()
8018a3444e39  RDMA/hns: Fix uninitialized ucmd in hns_roce_create_qp_common()
159639486834  RDMA/hns: Fix signed-unsigned mixed comparisons
3ebf42fe8cc7  tty: tty_jobctrl: fix pid memleak in disassociate_ctty()

Rejected(5):
bdb7de7ed5ba  iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user()
9fe0f6b5720e  sched/uclamp: Ignore (util == 0) optimization in feec() when p_util_max = 0
4e7bad730160  net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT
e897dcbd5fbc  net: add DEV_STATS_READ() helper
9954a7f3808b  ipvlan: properly track tx_errors

Kabi broken(11):
666a4120dcf6  arm64/arm: xen: enlighten: Fix KPTI checks
9f831533d2d0  mfd: core: Un-constify mfd_cell.of_reg
b708eb26b560  mfd: core: Ensure disabled devices are skipped without aborting
c2766ed2b7af  mfd: dln2: Fix double put in dln2_probe
f830d4f69835  inet: shrink struct flowi_common
08588fac00b1  interconnect: qcom: sc7180: Retire DEFINE_QBCM
362f0241dbe9  interconnect: qcom: sc7180: Set ACV enable_mask
4df18b233ef2  arm64: dts: qcom: msm8916: Fix iommu local address
8bd7c8a9b838  arm64: dts: qcom: sdm845-mtp: fix WiFi configuration
a44aa8d8a532  ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator
5e5b85ea0f4b  soc: qcom: llcc: Handle a second device without data  corruption


Total patches: 186 - 5 - 5 - 11 = 165 
 
Link:https://gitee.com/openeuler/kernel/pulls/5711

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b31b5d90 49201093

Documentation/process/deprecated.rst

+17 −3
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ Instead, the 2-factor form of the allocator should be used:: 


	foo = kmalloc_array(count, size, GFP_KERNEL);



Specifically, kmalloc() can be replaced with kmalloc_array(), and

kzalloc() can be replaced with kcalloc().



If no 2-factor form is available, the saturate-on-overflow helpers should

be used::
@@ -90,9 +93,20 @@ Instead, use the helper:: 
        array usage and switch to a `flexible array member

        <#zero-length-and-one-element-arrays>`_ instead.



See array_size(), array3_size(), and struct_size(),

for more details as well as the related check_add_overflow() and

check_mul_overflow() family of functions.

For other calculations, please compose the use of the size_mul(),

size_add(), and size_sub() helpers. For example, in the case of::



	foo = krealloc(current_size + chunk_size * (count - 3), GFP_KERNEL);



Instead, use the helpers::



	foo = krealloc(size_add(current_size,

				size_mul(chunk_size,

					 size_sub(count, 3))), GFP_KERNEL);



For more details, also see array3_size() and flex_array_size(),

as well as the related check_mul_overflow(), check_add_overflow(),

check_sub_overflow(), and check_shl_overflow() family of functions.



simple_strtol(), simple_strtoll(), simple_strtoul(), simple_strtoull()

----------------------------------------------------------------------

arch/arm/lib/memset.S

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ ENTRY(__memset) 
ENTRY(mmioset)

WEAK(memset)

UNWIND( .fnstart         )

	and	r1, r1, #255		@ cast to unsigned char

	ands	r3, r0, #3		@ 1 unaligned?

	mov	ip, r0			@ preserve r0 as return value

	bne	6f			@ 1

arch/powerpc/include/asm/nohash/32/pte-40x.h

+0 −3
Original line number Diff line number Diff line
@@ -69,9 +69,6 @@ 


#define _PTE_NONE_MASK	0



/* Until my rework is finished, 40x still needs atomic PTE updates */

#define PTE_ATOMIC_UPDATES	1



#define _PAGE_BASE_NC	(_PAGE_PRESENT | _PAGE_ACCESSED)

#define _PAGE_BASE	(_PAGE_BASE_NC)

arch/powerpc/perf/imc-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int trace_imc_mem_size; 
 * core and trace-imc

 */

static struct imc_pmu_ref imc_global_refc = {

	.lock = __SPIN_LOCK_INITIALIZER(imc_global_refc.lock),

	.lock = __SPIN_LOCK_UNLOCKED(imc_global_refc.lock),

	.id = 0,

	.refc = 0,

};

arch/powerpc/platforms/pseries/lpar.c

+3 −1
Original line number Diff line number Diff line
@@ -523,8 +523,10 @@ static ssize_t vcpudispatch_stats_write(struct file *file, const char __user *p, 


	if (cmd) {

		rc = init_cpu_associativity();

		if (rc)

		if (rc) {

			destroy_cpu_associativity();

			goto out;

		}



		for_each_possible_cpu(cpu) {

			disp = per_cpu_ptr(&vcpu_disp_data, cpu);