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

!15204 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.69-6.6.70 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.69..v6.6.70 | wc -l
217
166+11+2+1+37

Conflicts(11):
wifi: ath12k: Optimize the mac80211 hw data access
usb: typec: ucsi: glink: move GPIO reading into connector_status callback
usb: typec: ucsi: glink: set orientation aware if supported
usb: typec: ucsi: glink: be more precise on orientation-aware ports
btrfs: rename and export __btrfs_cow_block()
usb: typec: ucsi: glink: fix off-by-one in connector_status
seq_buf: Introduce DECLARE_SEQ_BUF and seq_buf_str()
tracing: Handle old buffer mappings for event strings and functions
tracing: Fix trace_check_vprintf() when tp_printk is used
seq_buf: Make DECLARE_SEQ_BUF() usable
Revert "bpf: support non-r10 register spill/fill to/from stack in precision tracking"

check-kabi(2):
x86/ptrace: Add FRED additional information to the pt_regs structure
x86/ptrace: Cleanup the definition of the pt_regs structure

编译报错(1):
ALSA: hda/ca0132: Use standard HD-audio quirk matching helpers

merged(37):
RDMA/hns: Remove unused parameters and variables
RDMA/hns: Refactor mtr find
tracing: Check "%s" dereference via the field and not the TP_printk format
scsi: hisi_sas: Fix a deadlock issue related to automatic dump
btrfs: fix use-after-free when COWing tree bock and tracing is enabled
ACPI/IORT: Add PMCG platform information for HiSilicon HIP10/11
mailbox: pcc: Add support for platform notification handling
scsi: hisi_sas: Directly call register snapshot instead of using workqueue
scsi: hisi_sas: Allocate DFX memory during dump trigger
scsi: hisi_sas: Create all dump files during debugfs initialization
wifi: ath12k: fix atomic calls in ath12k_mac_op_set_bitrate_mask()
wifi: mac80211: Add non-atomic station iterator
wifi: rtw88: use ieee80211_purge_tx_queue() to purge TX skb
wifi: mac80211: export ieee80211_purge_tx_queue() for drivers
ACPI: PCC: Add PCC shared memory region command and status bitfields
i2c: xgene-slimpro: Migrate to use generic PCC shmem related macros
mailbox: pcc: Support shared interrupt for multiple subspaces
ACPI/IORT: Add PMCG platform information for HiSilicon HIP09A
btrfs: fix use-after-free in btrfs_encoded_read_endio()
selinux: ignore unknown extended permissions
f2fs: fix to wait dio completion
tracing: Have process_string() also allow arrays
RDMA/hns: Fix missing flush CQE for DWQE
RDMA/hns: Fix warning storm caused by invalid input in IO path
RDMA/hns: Fix mapping error of zero-hop WQE buffer
net: fix memory leak in tcp_conn_request()
net/mlx5e: Skip restore TC rules for vport rep without loaded flag
net: wwan: t7xx: Fix FSM command timeout issue
ALSA: hda/ca0132: Use standard HD-audio quirk matching helpers
btrfs: flush delalloc workers queue before stopping cleaner kthread during unmount
ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
ALSA: seq: oss: Fix races at processing SysEx messages
pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking
gve: guard XDP xmit NDO on existence of xdp queues
gve: guard XSK operations on the existence of queues
mptcp: fix TCP options overflow.
scsi: hisi_sas: Remove redundant checks for automatic debugfs dump



check-kabi error(14): 
 
Link:https://gitee.com/openeuler/kernel/pulls/15204

 

Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 9d22d5b7 b3edd84c

Documentation/admin-guide/media/building.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Please notice, however, that, if: 


you should use the main media development tree ``master`` branch:



    https://git.linuxtv.org/media_tree.git/

    https://git.linuxtv.org/media.git/



In this case, you may find some useful information at the

`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

Documentation/admin-guide/media/saa7134.rst

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ Changes / Fixes 
Please mail to linux-media AT vger.kernel.org unified diffs against

the linux media git tree:



    https://git.linuxtv.org/media_tree.git/

    https://git.linuxtv.org/media.git/



This is done by committing a patch at a clone of the git tree and

submitting the patch using ``git send-email``. Don't forget to

Documentation/i2c/busses/i2c-i801.rst

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ Supported adapters: 
  * Intel Raptor Lake (PCH)

  * Intel Meteor Lake (SOC and PCH)

  * Intel Birch Stream (SOC)

  * Intel Arrow Lake (SOC)

  * Intel Panther Lake (SOC)



   Datasheets: Publicly available at the Intel website

arch/loongarch/kernel/numa.c

+1 −27
Original line number Diff line number Diff line
@@ -226,32 +226,6 @@ static void __init node_mem_init(unsigned int node) 


#ifdef CONFIG_ACPI_NUMA



/*

 * Sanity check to catch more bad NUMA configurations (they are amazingly

 * common).  Make sure the nodes cover all memory.

 */

static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)

{

	int i;

	u64 numaram, biosram;



	numaram = 0;

	for (i = 0; i < mi->nr_blks; i++) {

		u64 s = mi->blk[i].start >> PAGE_SHIFT;

		u64 e = mi->blk[i].end >> PAGE_SHIFT;



		numaram += e - s;

		numaram -= __absent_pages_in_range(mi->blk[i].nid, s, e);

		if ((s64)numaram < 0)

			numaram = 0;

	}

	max_pfn = max_low_pfn;

	biosram = max_pfn - absent_pages_in_range(0, max_pfn);



	BUG_ON((s64)(biosram - numaram) >= (1 << (20 - PAGE_SHIFT)));

	return true;

}



static void __init add_node_intersection(u32 node, u64 start, u64 size, u32 type)

{

	static unsigned long num_physpages;
@@ -431,7 +405,7 @@ int __init init_numa_memory(void) 
		return -EINVAL;



	init_node_memblock();

	if (numa_meminfo_cover_memory(&numa_meminfo) == false)

	if (!memblock_validate_numa_coverage(SZ_1M))

		return -EINVAL;



	for_each_node_mask(node, node_possible_map) {

arch/x86/include/asm/tlb.h

+4 −0
Original line number Diff line number Diff line
@@ -34,4 +34,8 @@ static inline void __tlb_remove_table(void *table) 
	free_page_and_swap_cache(table);

}



static inline void invlpg(unsigned long addr)

{

	asm volatile("invlpg (%0)" ::"r" (addr) : "memory");

}

#endif /* _ASM_X86_TLB_H */