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

!2442 Backport 5.10.176 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
Issue: #I87BGI

Backport 5.10.176 LTS patches from upstream.

Conflicts:

Already merged(11):
c54974ccaff7: KVM: nVMX: add missing consistency checks for CR0 and CR4
35f049abbae3: xfs: remove XFS_PREALLOC_SYNC
308dfe49eb75: xfs: fallocate() should call file_modified()
d6f223cfef32: xfs: don't assert fail on perag references on teardown
8cf9400f8948: xfs: set prealloc flag in xfs_alloc_file_space()
f60b68c46444: xfs: use setattr_copy to set vfs inode attributes
43aa468df246: nfc: st-nci: Fix use after free bug in ndlc_remove due to race condition
0a73c8b3cc99: hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to race condition
83c3b2f4e7c6: ftrace: Fix invalid address access in lookup_rec() when index is 0
c84fb2962680: xfs: don't leak btree cursor when insrec fails after a split
adb4ac52b7df: xfs: remove xfs_setattr_time() declaration

Rejected(1):
be60f08c03de: xfs: purge dquots after inode walk fails during quotacheck

Kabi broken(3):
baea3ae425fb: fs: move should_remove_suid()
4700f27fca3f: attr: add setattr_should_drop_sgid()
f5424864b368: attr: use consistent sgid stripping checks

Total patches: 98 - 11 - 1 - 3 = 83 
 
Link:https://gitee.com/openeuler/kernel/pulls/2442

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d7903642 452e8bed

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ defined: 
	return

	-ECHILD and it will be called again in ref-walk mode.



``_weak_revalidate``

``d_weak_revalidate``

	called when the VFS needs to revalidate a "jumped" dentry.  This

	is called when a path-walk ends at dentry that was not acquired

	by doing a lookup in the parent directory.  This includes "/",

arch/s390/boot/ipl_report.c

+8 −0
Original line number Diff line number Diff line
@@ -57,11 +57,19 @@ static unsigned long find_bootdata_space(struct ipl_rb_components *comps, 
	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&

	    intersects(INITRD_START, INITRD_SIZE, safe_addr, size))

		safe_addr = INITRD_START + INITRD_SIZE;

	if (intersects(safe_addr, size, (unsigned long)comps, comps->len)) {

		safe_addr = (unsigned long)comps + comps->len;

		goto repeat;

	}

	for_each_rb_entry(comp, comps)

		if (intersects(safe_addr, size, comp->addr, comp->len)) {

			safe_addr = comp->addr + comp->len;

			goto repeat;

		}

	if (intersects(safe_addr, size, (unsigned long)certs, certs->len)) {

		safe_addr = (unsigned long)certs + certs->len;

		goto repeat;

	}

	for_each_rb_entry(cert, certs)

		if (intersects(safe_addr, size, cert->addr, cert->len)) {

			safe_addr = cert->addr + cert->len;

arch/x86/kernel/cpu/mce/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2310,6 +2310,7 @@ static void mce_restart(void) 
{

	mce_timer_delete_all();

	on_each_cpu(mce_cpu_restart, NULL, 1);

	mce_schedule_work();

}



/* Toggle features for corrected errors */

arch/x86/mm/mem_encrypt_identity.c

+2 −1
Original line number Diff line number Diff line
@@ -586,7 +586,8 @@ void __init sme_enable(struct boot_params *bp) 
	cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |

				     ((u64)bp->ext_cmd_line_ptr << 32));



	cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));

	if (cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)) < 0)

		return;



	if (!strncmp(buffer, cmdline_on, sizeof(buffer)))

		sme_me_mask = me_mask;

drivers/block/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -16,13 +16,7 @@ menuconfig BLK_DEV 


if BLK_DEV



config BLK_DEV_NULL_BLK

	tristate "Null test block driver"

	select CONFIGFS_FS



config BLK_DEV_NULL_BLK_FAULT_INJECTION

	bool "Support fault injection for Null test block driver"

	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION

source "drivers/block/null_blk/Kconfig"



config BLK_DEV_FD

	tristate "Normal floppy disk support"