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

!13189 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.58-6.6.59 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.58..v6.6.59 | wc -l
206
175+15+10+6

Merged(15):
mm/khugepaged: convert alloc_charge_hpage() to use folios
mm: convert collapse_huge_page() to use a folio
mm/khugepaged: use a folio more in collapse_file()
khugepaged: inline hpage_collapse_alloc_folio()
khugepaged: convert alloc_charge_hpage to alloc_charge_folio
khugepaged: remove hpage from collapse_file()
mm: khugepaged: fix the arguments order in khugepaged_collapse_file trace point
uprobe: avoid out-of-bounds memory access of fetching args
nfsd: cancel nfsd_shrinker_work using sync mode in nfs4_state_shutdown_net
drm/msm: Avoid NULL dereference in msm_disp_state_print_regs()
smb: client: fix possible double free in smb2_set_ea()
tracing: Consider the NULL character when validating the event length
octeon_ep: Add SKB allocation failures handling in __octep_oq_process_rx()
octeon_ep: Implement helper for iterating packets in Rx queue
smb: client: Handle kstrdup failures for passwords

Conflicts(10):
x86/resctrl: Avoid overflow in MB settings in bw_validate()
tracing/probes: Support $argN in return probe (kprobe and fprobe)
uprobes: encapsulate preparation of uprobe args buffer
uprobes: prepare uprobe args buffer lazily
uprobes: prevent mutex_lock() under rcu_read_lock()
exec: don't WARN for racy path_noexec check
bpf: Add MEM_WRITE attribute
bpf: Fix overloading of MEM_UNINIT's meaning
bpf: Remove MEM_UNINIT from skb/xdp MTU helpers
tracing: probes: Fix to zero initialize a local variable

checkkabi failed(6)：
bpf: fix unpopulated name_len field in perf_event link info
bpf: Add cookie to perf_event bpf_link_info records
bpf: Add missed value to kprobe perf link info
sched/core: Disable page allocation in task_tick_mm_cid()
task_work: Add TWA_NMI_CURRENT as an additional notify mode.
task_work: make TWA_NMI_CURRENT handling conditional on IRQ_WORK 
 
Link:https://gitee.com/openeuler/kernel/pulls/13189

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 15bd887b e5444d24

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

+9 −9
Original line number Diff line number Diff line
@@ -102,21 +102,21 @@ properties: 
    default: 2



  interrupts:

    anyOf:

      - minItems: 1

        items:

          - description: TX interrupt

          - description: RX interrupt

      - items:

          - description: common/combined interrupt

    minItems: 1

    maxItems: 2



  interrupt-names:

    oneOf:

      - minItems: 1

      - description: TX interrupt

        const: tx

      - description: RX interrupt

        const: rx

      - description: TX and RX interrupts

        items:

          - const: tx

          - const: rx

      - const: common

      - description: Common/combined interrupt

        const: common



  fck_parent:

    $ref: /schemas/types.yaml#/definitions/string

arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
};



&hdmi {

	hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

};

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#

# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=--no-undefined -X

LDFLAGS_vmlinux	:=--no-undefined -X --pic-veneer



ifeq ($(CONFIG_RELOCATABLE), y)

# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour

arch/arm64/kvm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -922,6 +922,9 @@ static int kvm_vcpu_suspend(struct kvm_vcpu *vcpu) 
static int check_vcpu_requests(struct kvm_vcpu *vcpu)

{

	if (kvm_request_pending(vcpu)) {

		if (kvm_check_request(KVM_REQ_VM_DEAD, vcpu))

			return -EIO;



		if (kvm_check_request(KVM_REQ_SLEEP, vcpu))

			kvm_vcpu_sleep(vcpu);

arch/arm64/kvm/sys_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
	 * one cache line.

	 */

	if (kvm_has_mte(vcpu->kvm))

		clidr |= 2 << CLIDR_TTYPE_SHIFT(loc);

		clidr |= 2ULL << CLIDR_TTYPE_SHIFT(loc);



	__vcpu_sys_reg(vcpu, r->reg) = clidr;