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

!15227 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.54-6.6.55 LTS Conflicts Patches 

Merge Pull Request from: @koishimind 
 
git log --oneline OLK-6.6..OLK-6.6-v6.6.55-confilcts|wc -l
13
7+3+1+1+1

Merged(7):
proc: add config & param to block forcing mem writes
HID: Ignore battery for all ELAN I2C-HID devices
ata: sata_sil: Rename sil_blacklist to sil_quirks
ata: pata_serverworks: Do not use the term blacklist
scsi: aacraid: Rearrange order of struct aac_srb_unit
i2c: synquacer: Deal with optional PCLK correctly
i2c: synquacer: Remove a clk reference from struct synquacer_i2c

Submit after modification(3):
iomap: handle a post-direct I/O invalidate race in iomap_write_delalloc_release
mm: z3fold: deprecate CONFIG_Z3FOLD
null_blk: Remove usage of the deprecated ida_simple_xx() API

Submit after modification, kabi use(1+1+1):
uprobes: Fix race in uprobe_free_utask
[mainline-v6.13-rc1 fix perf,x86: avoid missing caller address in stack traces captured in uprobe]
perf,x86: Fix kabi breakage in struct uprobe_task
perf,x86: avoid missing caller address in stack traces captured in uprobe

This pr not commit for 6.6.54-6.6.55 LTS Conflicts:
Reason: KABI reserve will be use out.
KABI unsolved(2):
i2c: core: Lock address during client device instantiation
i2c: create debugfs entry per adapter 
 
Link:https://gitee.com/openeuler/kernel/pulls/15227

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 247e5bd9 b01a6bf3

Documentation/admin-guide/kernel-parameters.txt

+10 −0
Original line number Diff line number Diff line
@@ -4743,6 +4743,16 @@ 
	printk.time=	Show timing data prefixed to each printk message line

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)



	proc_mem.force_override= [KNL]

			Format: {always | ptrace | never}

			Traditionally /proc/pid/mem allows memory permissions to be

			overridden without restrictions. This option may be set to

			restrict that. Can be one of:

			- 'always': traditional behavior always allows mem overrides.

			- 'ptrace': only allow mem overrides for active ptracers.

			- 'never':  never allow mem overrides.

			If not specified, default is the CONFIG_PROC_MEM_* choice.



	processor.max_cstate=	[HW,ACPI]

			Limit processor to maximum C-state

			max_cstate=9 overrides any DMI blacklist limit.

arch/arm64/configs/openeuler_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -1102,11 +1102,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y 
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set

CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"

# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set

# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set

# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y

CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"

CONFIG_ZBUD=y

# CONFIG_Z3FOLD is not set

# CONFIG_Z3FOLD_DEPRECATED is not set

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -7313,6 +7313,9 @@ CONFIG_ENCRYPTED_KEYS=y 
# CONFIG_USER_DECRYPTED_DATA is not set

# CONFIG_KEY_DH_OPERATIONS is not set

# CONFIG_SECURITY_DMESG_RESTRICT is not set

CONFIG_PROC_MEM_ALWAYS_FORCE=y

# CONFIG_PROC_MEM_FORCE_PTRACE is not set

# CONFIG_PROC_MEM_NO_FORCE is not set

CONFIG_SECURITY=y

CONFIG_SECURITYFS=y

CONFIG_SECURITY_NETWORK=y

arch/loongarch/configs/loongson3_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ CONFIG_BINFMT_MISC=m 
CONFIG_ZSWAP=y

CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y

CONFIG_ZBUD=y

CONFIG_Z3FOLD=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_FREELIST_RANDOM=y

# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set

arch/powerpc/configs/openeuler_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -769,11 +769,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y 
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set

CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set

# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set

# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set

CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"

CONFIG_ZBUD=y

# CONFIG_Z3FOLD is not set

# CONFIG_Z3FOLD_DEPRECATED is not set

CONFIG_ZSMALLOC=y

# CONFIG_ZSMALLOC_STAT is not set
@@ -6856,6 +6856,9 @@ CONFIG_ENCRYPTED_KEYS=y 
# CONFIG_USER_DECRYPTED_DATA is not set

# CONFIG_KEY_DH_OPERATIONS is not set

# CONFIG_SECURITY_DMESG_RESTRICT is not set

CONFIG_PROC_MEM_ALWAYS_FORCE=y

# CONFIG_PROC_MEM_FORCE_PTRACE is not set

# CONFIG_PROC_MEM_NO_FORCE is not set

CONFIG_SECURITY=y

CONFIG_SECURITY_WRITABLE_HOOKS=y

CONFIG_SECURITYFS=y

arch/powerpc/configs/ppc64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ CONFIG_MODULE_SIG_SHA512=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_Z3FOLD=y

CONFIG_ZSMALLOC=y

# CONFIG_SLAB_MERGE_DEFAULT is not set

CONFIG_SLAB_FREELIST_RANDOM=y