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

!13092 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.55-6.6.57 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.55..v6.6.57 | wc -l
212
178+4+23+6+1

Conflicts（4）:
scsi: Remove scsi device no_start_on_resume flag
scsi: sd: Do not repeat the starting disk message
ext4: don't set SB_RDONLY after filesystem errors
scsi: Revert "scsi: sd: Do not repeat the starting disk message"

Merged（23）:
Bluetooth: Fix usage of __hci_cmd_sync_status
ntfs3: Change to non-blocking allocation in ntfs_d_hash
zram: free secondary algorithms names
zram: don't free statically defined names
bpf: Prevent tail call between progs attached to different hooks
io_uring: check if we need to reschedule during overflow flush
ntb: ntb_hw_switchtec: Fix use after free vulnerability in switchtec_ntb_remove due to race condition
serial: protect uart_port_dtr_rts() in uart_shutdown() too
usb: typec: tipd: Free IRQ only if it was requested before
driver core: bus: Fix double free in driver API bus_register()
drm/amd/display: Check null pointer before dereferencing se
smb: client: fix UAF in async decryption
NFSv4: Prevent NULL-pointer dereference in nfs42_complete_copies()
i40e: Fix macvlan leak by synchronizing access to mac_filter_hash
igb: Do not bring the device up after non-fatal error
net: do not delay dst_entries_add() in dst_release()
slip: make slhc_remember() more robust against malicious packets
wifi: mac80211: Avoid address calculations via out of bounds array indexing
Bluetooth: hci_conn: Fix UAF in hci_enhanced_setup_sync
scsi: wd33c93: Don't use stale scsi_pointer value
device-dax: correct pgoff align in dax_set_mapping()
kthread: unpark only parked kthread
NFSD: Mark filecache "down" if init fails

checkkabi failed（6）:

phonet: Handle error of rtnl_register_module(). 
phonet: no longer hold RTNL in route_dumpit()
mpls: Handle error of rtnl_register_module(). 
mpls: no longer hold RTNL in mpls_netconf_dump_devconf()
rtnetlink: add RTNL_FLAG_DUMP_UNLOCKED flag
rtnetlink: change nlk->cb_mutex role 

 

checkconfig failed（1）:

HID: mcp2200: added driver for GPIOs of MCP2200

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

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 4f656250 5b59fa51

Documentation/dev-tools/kselftest.rst

+12 −0
Original line number Diff line number Diff line
@@ -255,9 +255,21 @@ Contributing new tests (details) 


   TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the

   executable which is not tested by default.



   TEST_FILES, TEST_GEN_FILES mean it is the file which is used by

   test.



   TEST_INCLUDES is similar to TEST_FILES, it lists files which should be

   included when exporting or installing the tests, with the following

   differences:



    * symlinks to files in other directories are preserved

    * the part of paths below tools/testing/selftests/ is preserved when

      copying the files to the output directory



   TEST_INCLUDES is meant to list dependencies located in other directories of

   the selftests hierarchy.



 * First use the headers inside the kernel source and/or git repo, and then the

   system headers.  Headers for the kernel release as opposed to headers

   installed by the distro on the system should be the primary focus to be able

arch/loongarch/pci/acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	if (bus) {

		memcpy(bus->sysdata, info->cfg, sizeof(struct pci_config_window));

		kfree(info);

		kfree(root_ops);

	} else {

		struct pci_bus *child;

arch/powerpc/configs/ps3_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ CONFIG_PS3_VRAM=m 
CONFIG_PS3_LPM=m

# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

CONFIG_KEXEC=y

# CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2 is not set

CONFIG_PPC_4K_PAGES=y

CONFIG_SCHED_SMT=y

CONFIG_PM=y

arch/riscv/include/asm/sbi.h

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ static inline int sbi_remote_fence_i(const struct cpumask *cpu_mask) { return -1 
static inline void sbi_init(void) {}

#endif /* CONFIG_RISCV_SBI */



unsigned long riscv_get_mvendorid(void);

unsigned long riscv_get_marchid(void);

unsigned long riscv_cached_mvendorid(unsigned int cpu_id);

unsigned long riscv_cached_marchid(unsigned int cpu_id);

unsigned long riscv_cached_mimpid(unsigned int cpu_id);

arch/riscv/include/asm/sparsemem.h

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

#define MAX_PHYSMEM_BITS	56

#else

#define MAX_PHYSMEM_BITS	34

#define MAX_PHYSMEM_BITS	32

#endif /* CONFIG_64BIT */

#define SECTION_SIZE_BITS	27

#endif /* CONFIG_SPARSEMEM */