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

!15142 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.66-6.6.68 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.66..v6.6.68 | wc -l
226
191+5+30

Conflicts(5):
bpf: Fix UAF via mismatching bpf_prog/attachment RCU flavors
KVM: arm64: Disable MPAM visibility by default and ignore VMM writes
bpf: sync_linked_regs() must preserve subreg_def
net: hinic: Fix cleanup in create_rxqs/txqs()
KVM: x86: Play nice with protected guests in complete_hypercall_exit()

merged(30):
perf/x86/intel/ds: Unconditionally drain PEBS DS when changing PEBS_DATA_CFG
blk-cgroup: Fix UAF in blkcg_unpin_online()
drm/i915: Fix NULL pointer dereference in capture_engine
bpf: Check size for BTF-based ctx access of pointer members
bpf: Fix theoretical prog_array UAF in _uprobe_perf_func()
bpf,perf: Fix invalid prog_array access in perf_event_detach_bpf_prog
wifi: nl80211: fix NL80211_ATTR_MLO_LINK_ID off-by-one
acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl
net/mlx5: DR, prevent potential error pointer dereference
net: renesas: rswitch: avoid use-after-put for a device tree node
Bluetooth: hci_event: Fix using rcu_read(un)lock while iterating
Bluetooth: ISO: Reassociate a socket with an active BIS
Bluetooth: btmtk: avoid UAF in btmtk_process_coredump
selftests/bpf: Add netlink helper library
x86/xen: don't do PV iret hypercall through hypercall page
ALSA: usb-audio: Fix a DMA to stack memory bug
net: stmmac: fix TSO DMA API usage causing oops
xfs: don't walk off the end of a directory data block
xfs: use XFS_BUF_DADDR_NULL for daddrs in getfsmap code
net/smc: protect link down work from execute after lgr freed
net/smc: check return value of sock_recvmsg when draining clc data
net/smc: check smcd_v2_ext_offset when receiving proposal msg
net/smc: check v2_ext_offset/eid_cnt/ism_gid_cnt when receiving proposal msg
net/smc: check iparea_offset and ipv6_prefixes_cnt when receiving proposal msg
ionic: Fix netdev notifier unregister on failure
drm/modes: Avoid divide by zero harder in drm_mode_vrefresh()
io_uring: check if iowq is killed before queuing
nilfs2: prevent use of deleted inode
net: defer final 'struct net' free in netns dismantle
netfilter: IDLETIMER: Fix for possible ABBA deadlock 
 
Link:https://gitee.com/openeuler/kernel/pulls/15142

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7c834950 300b91f8

Documentation/ABI/testing/sysfs-fs-xfs

+4 −4
Original line number Diff line number Diff line 
What:		/sys/fs/xfs/<disk>/log/log_head_lsn

Date:		July 2014

KernelVersion:	3.17

Contact:	xfs@oss.sgi.com

Contact:	linux-xfs@vger.kernel.org

Description:

		The log sequence number (LSN) of the current head of the

		log. The LSN is exported in "cycle:basic block" format.
@@ -10,7 +10,7 @@ Users: xfstests 
What:		/sys/fs/xfs/<disk>/log/log_tail_lsn

Date:		July 2014

KernelVersion:	3.17

Contact:	xfs@oss.sgi.com

Contact:	linux-xfs@vger.kernel.org

Description:

		The log sequence number (LSN) of the current tail of the

		log. The LSN is exported in "cycle:basic block" format.
@@ -18,7 +18,7 @@ Description: 
What:		/sys/fs/xfs/<disk>/log/reserve_grant_head

Date:		July 2014

KernelVersion:	3.17

Contact:	xfs@oss.sgi.com

Contact:	linux-xfs@vger.kernel.org

Description:

		The current state of the log reserve grant head. It

		represents the total log reservation of all currently
@@ -29,7 +29,7 @@ Users: xfstests 
What:		/sys/fs/xfs/<disk>/log/write_grant_head

Date:		July 2014

KernelVersion:	3.17

Contact:	xfs@oss.sgi.com

Contact:	linux-xfs@vger.kernel.org

Description:

		The current state of the log write grant head. It

		represents the total log reservation of all currently

Documentation/devicetree/bindings/net/fsl,fec.yaml

+7 −0
Original line number Diff line number Diff line
@@ -182,6 +182,13 @@ properties: 
    description:

      Register bits of stop mode control, the format is <&gpr req_gpr req_bit>.



  fsl,pps-channel:

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

    default: 0

    description:

      Specifies to which timer instance the PPS signal is routed.

    enum: [0, 1, 2, 3]



  mdio:

    $ref: mdio.yaml#

    unevaluatedProperties: false

Documentation/power/runtime_pm.rst

+3 −1
Original line number Diff line number Diff line
@@ -347,7 +347,9 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 


  `int pm_runtime_resume_and_get(struct device *dev);`

    - run pm_runtime_resume(dev) and if successful, increment the device's

      usage counter; return the result of pm_runtime_resume

      usage counter; returns 0 on success (whether or not the device's

      runtime PM status was already 'active') or the error code from

      pm_runtime_resume() on failure.



  `int pm_request_idle(struct device *dev);`

    - submit a request to execute the subsystem-level idle callback for the

arch/hexagon/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -32,3 +32,9 @@ KBUILD_LDFLAGS += $(ldflags-y) 
TIR_NAME := r19

KBUILD_CFLAGS += -ffixed-$(TIR_NAME) -DTHREADINFO_REG=$(TIR_NAME) -D__linux__

KBUILD_AFLAGS += -DTHREADINFO_REG=$(TIR_NAME)



# Disable HexagonConstExtenders pass for LLVM versions prior to 19.1.0

# https://github.com/llvm/llvm-project/issues/99714

ifneq ($(call clang-min-version, 190100),y)

KBUILD_CFLAGS += -mllvm -hexagon-cext=false

endif

arch/mips/boot/dts/loongson/loongson64g_4core_ls7a.dts

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
		compatible = "loongson,pch-msi-1.0";

		reg = <0 0x2ff00000 0 0x8>;

		interrupt-controller;

		#interrupt-cells = <1>;

		msi-controller;

		loongson,msi-base-vec = <64>;

		loongson,msi-num-vecs = <192>;