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

!12634 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.53-6.6.54 LTS Patches

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.53..v6.6.54 | wc -l
533
478+24+10+21
Merged commits(24)

net: stmmac: dwmac-loongson: Init ref and PTP clocks rate
drivers/perf: Fix ali_drw_pmu driver interrupt status clearing
drivers/perf: hisi_pcie: Record hardware counts correctly
drivers/perf: hisi_pcie: Fix TLP headers bandwidth counting
crypto: hisilicon/hpre - mask cluster timeout error
can: bcm: Clear bo->bcm_proc_read after remove_proc_entry().
RDMA/hns: Fix the overflow risk of hem_list_calc_ba_range()
RDMA/hns: Fix spin_unlock_irqrestore() called with IRQs enabled
RDMA/hns: Fix VF triggering PF reset in abnormal interrupt handler
RDMA/hns: Fix 1bit-ECC recovery address in non-4K OS
RDMA/hns: Optimize hem allocation performance
RDMA/hns: Fix restricted __le16 degrades to integer issue
nfs: fix memory leak in error path of nfs4_do_reclaim
btrfs: fix race setting file private on concurrent lseek using same fd
bpf: Fix use-after-free in bpf_uprobe_multi_link_attach()
crypto: hisilicon/qm - reset device before enabling it
drm/amd/display: Add null check for set_output_gamma in dcn30_set_output_transfer_func
drivers: media: dvb-frontends/rtl2832: fix an out-of-bounds write error
ntb: intel: Fix the NULL vs IS_ERR() bug for debugfs_create_dir()
nfsd: call cache_put if xdr_reserve_space returns NULL
nfsd: return -EINVAL when namelen is 0
f2fs: fix to don't set SB_RDONLY in f2fs_handle_critical_error()
netfilter: nf_reject_ipv6: fix nf_reject_ip6_tcphdr_put()
wifi: mt76: mt7996: fix NULL pointer dereference in mt7996_mcu_sta_bfer_he

Conflicts commits(10)

sched/fair: Make SCHED_IDLE entity be preempted in strict hierarchy
RDMA/hns: Don't modify rq next block addr in HIP09 QPC
RDMA/hns: Fix Use-After-Free of rsv_qp on HIP08
lib/sbitmap: define swap_lock as raw_spinlock_t
xen: allow mapping ACPI data using a different physical address
arm64: errata: Enable the AC03_CPU_38 workaround for ampere1a
btrfs: update comment for struct btrfs_inode::lock
mm/filemap: return early if failed to allocate memory for split
lib/xarray: introduce a new helper xas_get_order
mm/filemap: optimize filemap folio adding

checkkabi fail(21)

sched/numa: Fix the vma scan starving issue
sched/numa: Complete scanning of inactive VMAs when there is no alternative
sched/numa: Complete scanning of partial VMAs regardless of PID activity
sched/numa: Move up the access pid reset logic
sched/numa: Trace decisions related to skipping VMAs
sched/numa: Rename vma_numab_state::access_pids[] => ::pids_active[], ::next_pid_reset => ::pids_active_reset
sched/numa: Document vma_numab_state fields
perf time-utils: Fix 32-bit nsec parsing
perf sched timehist: Fixed timestamp error when unable to confirm event sched_in time
perf stat: Display iostat headers correctly
perf sched timehist: Fix missing free of session in perf_sched__timehist()
perf report: Fix --total-cycles --stdio output error
perf ui/browser/annotate: Use global annotation_options
perf annotate: Move some source code related fields from 'struct annotation' to 'struct annotated_source'
perf annotate: Split branch stack cycles info from 'struct annotation'
perf inject: Fix leader sampling inserting additional samples
perf mem: Free the allocated sort string, fixing a leak
bpf: Zero former ARG_PTR_TO_{LONG,INT} args in case of error
bpf: Improve check_raw_mode_ok test for MEM_UNINIT-tagged types
bpf: Fix helper writes to read-only maps
bpf: Fix bpf_strtol and bpf_strtoul helpers for 32bit
 
 
Link:https://gitee.com/openeuler/kernel/pulls/12634

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a42fc9da fe7c9958
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ GTAGS
# id-utils files
ID

*.orig
*~
\#*#

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ KernelVersion:
Contact:	linux-iio@vger.kernel.org
Description:
		Reading this returns the valid values that can be written to the
		on_altvoltage0_mode attribute:
		filter_mode attribute:

		- auto -> Adjust bandpass filter to track changes in input clock rate.
		- manual -> disable/unregister the clock rate notifier / input clock tracking.
+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ properties:
          - ak8963
          - ak09911
          - ak09912
          - ak09916
        deprecated: true

  reg:
+13 −6
Original line number Diff line number Diff line
@@ -15,12 +15,19 @@ allOf:

properties:
  compatible:
    enum:
    oneOf:
      - enum:
          - nxp,imx8dxl-fspi
          - nxp,imx8mm-fspi
          - nxp,imx8mp-fspi
          - nxp,imx8qxp-fspi
          - nxp,imx8ulp-fspi
          - nxp,lx2160a-fspi
      - items:
          - enum:
              - nxp,imx93-fspi
              - nxp,imx95-fspi
          - const: nxp,imx8mm-fspi

  reg:
    items:
+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ at module load time (for a module) with::
	alerts_broken

The addresses are normal I2C addresses.  The adapter is the string
name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name.
name of the adapter, as shown in /sys/bus/i2c/devices/i2c-<n>/name.
It is *NOT* i2c-<n> itself.  Also, the comparison is done ignoring
spaces, so if the name is "This is an I2C chip" you can say
adapter_name=ThisisanI2cchip.  This is because it's hard to pass in
Loading