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

!15706 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.78-6.6.79 LTS Patches 

Merge Pull Request from: @koishimind 
 
git log --oneline v6.6.78..v6.6.79 | wc -l
152=131+2+1+13+5
131+2+1+2+13+5

check-kabi(2):
cgroup: fix race between fork and cgroup.kill
x86/mm/tlb: Only trim the mm_cpumask once a second

check-depends(1):
block: cleanup and fix batch completion adding conditions

check-depends(2):
HID: hid-steam: Fix use-after-free when detaching device
kbuild: hdrcheck: fix cross build with clang

merged(13):
nfsd: clear acl_access/acl_default after releasing them
NFSD: fix hang in nfsd4_shutdown_callback
HID: hid-thrustmaster: fix stack-out-of-bounds read in usb_check_int_endpoints()
LoongArch: csum: Fix OoB access in IP checksum code for negative lengths
gpiolib: Fix crash on error in gpiochip_get_ngpios()
media: vidtv: Fix a null-ptr-deref in vidtv_mux_stop_thread
NFS: Fix potential buffer overflowin nfs_sysfs_link_rpc_client()
orangefs: fix a oob in orangefs_debug_write
USB: hub: Ignore non-compliant devices with too many configs or interfaces
usb: cdc-acm: Check control transfer buffer size before access
clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
drm/amd/display: Add null check for head_pipe in dcn201_acquire_free_pipe_for_layer
drm/amd/display: Pass non-null to dcn20_validate_apply_pipe_split_flags

conflicts(5):
serial: port: Assign ->iotype correctly when ->iobase is set
serial: port: Always update ->iotype in __uart_read_properties()
clocksource: Use pr_info() for "Checking clocksource synchronization" message
md/raid5: recheck if reshape has finished with device_lock held
md/raid5: implement pers->bitmap_sector()

 
 
Link:https://gitee.com/openeuler/kernel/pulls/15706

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 663a9a1c 64afe1d9

Documentation/arch/arm64/elf_hwcaps.rst

+24 −12
Original line number Diff line number Diff line
@@ -174,22 +174,28 @@ HWCAP2_DCPODP 
    Functionality implied by ID_AA64ISAR1_EL1.DPB == 0b0010.



HWCAP2_SVE2

    Functionality implied by ID_AA64ZFR0_EL1.SVEVer == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.SVEver == 0b0001.



HWCAP2_SVEAES

    Functionality implied by ID_AA64ZFR0_EL1.AES == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.AES == 0b0001.



HWCAP2_SVEPMULL

    Functionality implied by ID_AA64ZFR0_EL1.AES == 0b0010.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.AES == 0b0010.



HWCAP2_SVEBITPERM

    Functionality implied by ID_AA64ZFR0_EL1.BitPerm == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.BitPerm == 0b0001.



HWCAP2_SVESHA3

    Functionality implied by ID_AA64ZFR0_EL1.SHA3 == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.SHA3 == 0b0001.



HWCAP2_SVESM4

    Functionality implied by ID_AA64ZFR0_EL1.SM4 == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.SM4 == 0b0001.



HWCAP2_FLAGM2

    Functionality implied by ID_AA64ISAR0_EL1.TS == 0b0010.
@@ -198,16 +204,20 @@ HWCAP2_FRINT 
    Functionality implied by ID_AA64ISAR1_EL1.FRINTTS == 0b0001.



HWCAP2_SVEI8MM

    Functionality implied by ID_AA64ZFR0_EL1.I8MM == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.I8MM == 0b0001.



HWCAP2_SVEF32MM

    Functionality implied by ID_AA64ZFR0_EL1.F32MM == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.F32MM == 0b0001.



HWCAP2_SVEF64MM

    Functionality implied by ID_AA64ZFR0_EL1.F64MM == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.F64MM == 0b0001.



HWCAP2_SVEBF16

    Functionality implied by ID_AA64ZFR0_EL1.BF16 == 0b0001.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.BF16 == 0b0001.



HWCAP2_I8MM

    Functionality implied by ID_AA64ISAR1_EL1.I8MM == 0b0001.
@@ -273,7 +283,8 @@ HWCAP2_EBF16 
    Functionality implied by ID_AA64ISAR1_EL1.BF16 == 0b0010.



HWCAP2_SVE_EBF16

    Functionality implied by ID_AA64ZFR0_EL1.BF16 == 0b0010.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.BF16 == 0b0010.



HWCAP2_CSSC

    Functionality implied by ID_AA64ISAR2_EL1.CSSC == 0b0001.
@@ -282,7 +293,8 @@ HWCAP2_RPRFM 
    Functionality implied by ID_AA64ISAR2_EL1.RPRFM == 0b0001.



HWCAP2_SVE2P1

    Functionality implied by ID_AA64ZFR0_EL1.SVEver == 0b0010.

    Functionality implied by ID_AA64PFR0_EL1.SVE == 0b0001 and

    ID_AA64ZFR0_EL1.SVEver == 0b0010.



HWCAP2_SME2

    Functionality implied by ID_AA64SMFR0_EL1.SMEver == 0b0001.

Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ description: 
  Each sub-node is identified using the node's name, with valid values listed

  for each of the pmics below.



  For mp5496, s1, s2

  For mp5496, s1, s2, l2, l5



  For pm2250, s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,

  l12, l13, l14, l15, l16, l17, l18, l19, l20, l21, l22

Makefile

+4 −9
Original line number Diff line number Diff line
@@ -1056,8 +1056,8 @@ LDFLAGS_vmlinux += --orphan-handling=$(CONFIG_LD_ORPHAN_WARN_LEVEL) 
endif



# Align the bit size of userspace programs with the kernel

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))



# make the checker run with the right architecture

CHECKFLAGS += --arch=$(ARCH)
@@ -1352,18 +1352,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),) 
	$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean

endif



# Clear a bunch of variables before executing the submake

ifeq ($(quiet),silent_)

tools_silent=s

endif



tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/

	$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*



# ---------------------------------------------------------------------------

# Kernel selftest

arch/alpha/include/uapi/asm/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ struct pt_regs { 
	unsigned long trap_a0;

	unsigned long trap_a1;

	unsigned long trap_a2;

/* This makes the stack 16-byte aligned as GCC expects */

	unsigned long __pad0;

/* These are saved by PAL-code: */

	unsigned long ps;

	unsigned long pc;

arch/alpha/kernel/asm-offsets.c

+2 −0
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ void foo(void) 
        DEFINE(CRED_EGID, offsetof(struct cred, egid));

        BLANK();



	DEFINE(SP_OFF, offsetof(struct pt_regs, ps));

	DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs));

	DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack));

	DEFINE(PT_PTRACED, PT_PTRACED);

	DEFINE(CLONE_VM, CLONE_VM);

	DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);