Skip to content

Commit 8e85ae6

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.155' into 6.1-main
This is the 6.1.155 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmjeZNQACgkQONu9yGCS # aT64QBAAjpFW/SAqORqN8/UYobK7gcf9RCyquBVXyZW7e84gTcDZCun5gbUpmMGs # gCE2eFdS/kHjPlv5rtEuejxsQEebF3zXYA8i1rznxAeBSw7H3XzGaPjH791QOX0R # rZxAXCfAAAMn7e/Sz2ssLtY0CDGLBgyknitGjHTUGY0+6htY0z9suB/3vnGI8id6 # V1QgkWRM84bYt6AGmoTNpVWXpxIO2Yffm7fwfuJsc9ZjO77lypAVKqEJ66uAdgUn # K+as8cL+P8GLnaVLkUJzpxDSo5wtJP+zjPk4E2nLg8O2E/TNkct5mkgY6lIPU3tw # s4Lvfbo0Xw2rrt8EXtJTHzpcHssNGqEjc00YA9YiMzTvN55eDQdR7sD74npVBXjg # 40n9kO8eAhCMVKRRic4CheejAhTJnbEcF/waldeK2apz3PrmPzQ68gz8PEMeFNrI # SQ2aHaoSY3jGpOdQmOvNzGSH7s6KPM+qvhMzlK9g8T3LqskujwRi6kBdNOmeLstg # zt+rCj946a/ioXiznipJRxae9eNZkzVlgYeQoVzjTsDDwj36JhIzVLh7W+e0v9bs # 3ofuHI4Auw/+ewrO82W1qhHy7t5jaK4x3BELsy5DDcFxA89BnLeG+6zG55b7DqpS # /C3ONadGVTHJz1fQokekh8QT1tV0Dj1uGqiNBtDXwrCioVjohU0= # =B6bT # -----END PGP SIGNATURE----- # gpg: Signature made Thu Oct 2 13:41:08 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents e3fda1a + 882efbd commit 8e85ae6

File tree

97 files changed

+910
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+910
-325
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 154
4+
SUBLEVEL = 155
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/arm/mm/pageattr.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static int change_page_range(pte_t *ptep, unsigned long addr, void *data)
2525
return 0;
2626
}
2727

28-
static bool in_range(unsigned long start, unsigned long size,
28+
static bool range_in_range(unsigned long start, unsigned long size,
2929
unsigned long range_start, unsigned long range_end)
3030
{
3131
return start >= range_start && start < range_end &&
@@ -63,8 +63,8 @@ static int change_memory_common(unsigned long addr, int numpages,
6363
if (!size)
6464
return 0;
6565

66-
if (!in_range(start, size, MODULES_VADDR, MODULES_END) &&
67-
!in_range(start, size, VMALLOC_START, VMALLOC_END))
66+
if (!range_in_range(start, size, MODULES_VADDR, MODULES_END) &&
67+
!range_in_range(start, size, VMALLOC_START, VMALLOC_END))
6868
return -EINVAL;
6969

7070
return __change_memory_common(start, size, set_mask, clear_mask);

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
cpu-thermal {
228228
polling-delay-passive = <250>;
229229
polling-delay = <2000>;
230-
thermal-sensors = <&tmu 0>;
230+
thermal-sensors = <&tmu 1>;
231231
trips {
232232
cpu_alert0: trip0 {
233233
temperature = <85000>;
@@ -257,7 +257,7 @@
257257
soc-thermal {
258258
polling-delay-passive = <250>;
259259
polling-delay = <2000>;
260-
thermal-sensors = <&tmu 1>;
260+
thermal-sensors = <&tmu 0>;
261261
trips {
262262
soc_alert0: trip0 {
263263
temperature = <85000>;

‎arch/s390/kernel/perf_cpum_cf.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,13 @@ static int cpumf_pmu_event_type(struct perf_event *event)
552552
static int cpumf_pmu_event_init(struct perf_event *event)
553553
{
554554
unsigned int type = event->attr.type;
555-
int err;
555+
int err = -ENOENT;
556556

557557
if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)
558558
err = __hw_perf_event_init(event, type);
559559
else if (event->pmu->type == type)
560560
/* Registered as unknown PMU */
561561
err = __hw_perf_event_init(event, cpumf_pmu_event_type(event));
562-
else
563-
return -ENOENT;
564562

565563
if (unlikely(err) && event->destroy)
566564
event->destroy(event);

‎arch/um/drivers/mconsole_user.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ static struct mconsole_command *mconsole_parse(struct mc_request *req)
7171
return NULL;
7272
}
7373

74+
#ifndef MIN
7475
#define MIN(a,b) ((a)<(b) ? (a):(b))
76+
#endif
7577

7678
#define STRINGX(x) #x
7779
#define STRING(x) STRINGX(x)

‎arch/x86/mm/pgtable.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static inline void pgd_list_del(pgd_t *pgd)
107107
#define UNSHARED_PTRS_PER_PGD \
108108
(SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
109109
#define MAX_UNSHARED_PTRS_PER_PGD \
110-
max_t(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD)
110+
MAX_T(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD)
111111

112112

113113
static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)

‎drivers/cpufreq/cpufreq.c‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2894,6 +2894,15 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
28942894
goto err_null_driver;
28952895
}
28962896

2897+
/*
2898+
* Mark support for the scheduler's frequency invariance engine for
2899+
* drivers that implement target(), target_index() or fast_switch().
2900+
*/
2901+
if (!cpufreq_driver->setpolicy) {
2902+
static_branch_enable_cpuslocked(&cpufreq_freq_invariance);
2903+
pr_debug("cpufreq: supports frequency invariance\n");
2904+
}
2905+
28972906
ret = subsys_interface_register(&cpufreq_interface);
28982907
if (ret)
28992908
goto err_boost_unreg;
@@ -2915,21 +2924,14 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
29152924
hp_online = ret;
29162925
ret = 0;
29172926

2918-
/*
2919-
* Mark support for the scheduler's frequency invariance engine for
2920-
* drivers that implement target(), target_index() or fast_switch().
2921-
*/
2922-
if (!cpufreq_driver->setpolicy) {
2923-
static_branch_enable_cpuslocked(&cpufreq_freq_invariance);
2924-
pr_debug("supports frequency invariance");
2925-
}
2926-
29272927
pr_debug("driver %s up and running\n", driver_data->name);
29282928
goto out;
29292929

29302930
err_if_unreg:
29312931
subsys_interface_unregister(&cpufreq_interface);
29322932
err_boost_unreg:
2933+
if (!cpufreq_driver->setpolicy)
2934+
static_branch_disable_cpuslocked(&cpufreq_freq_invariance);
29332935
remove_boost_sysfs_file();
29342936
err_null_driver:
29352937
write_lock_irqsave(&cpufreq_driver_lock, flags);

‎drivers/edac/sb_edac.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ static const u32 knl_interleave_list[] = {
109109
0x104, 0x10c, 0x114, 0x11c, /* 20-23 */
110110
};
111111
#define MAX_INTERLEAVE \
112-
(max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \
113-
max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \
112+
(MAX_T(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \
113+
MAX_T(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \
114114
ARRAY_SIZE(knl_interleave_list))))
115115

116116
struct interleave_pkg {

‎drivers/edac/skx_common.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#define I10NM_NUM_CHANNELS MAX(I10NM_NUM_DDR_CHANNELS, I10NM_NUM_HBM_CHANNELS)
4646
#define I10NM_NUM_DIMMS MAX(I10NM_NUM_DDR_DIMMS, I10NM_NUM_HBM_DIMMS)
4747

48-
#define MAX(a, b) ((a) > (b) ? (a) : (b))
4948
#define NUM_IMC MAX(SKX_NUM_IMC, I10NM_NUM_IMC)
5049
#define NUM_CHANNELS MAX(SKX_NUM_CHANNELS, I10NM_NUM_CHANNELS)
5150
#define NUM_DIMMS MAX(SKX_NUM_DIMMS, I10NM_NUM_DIMMS)

‎drivers/gpu/drm/amd/amdgpu/amdgpu.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,9 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
12581258

12591259
#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));
12601260

1261+
#ifndef MIN
12611262
#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
1263+
#endif
12621264

12631265
/* Common functions */
12641266
bool amdgpu_device_has_job_running(struct amdgpu_device *adev);

0 commit comments

Comments
 (0)